Skip to content

Commit

Permalink
powerpc: Use helpers for rlimits
Browse files Browse the repository at this point in the history
Make sure compiler won't do weird things with limits. E.g. fetching
them twice may return 2 different values after writable limits are
implemented.

I.e. either use rlimit helpers added in
3e10e71
or ACCESS_ONCE if not applicable.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: [email protected]
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
  • Loading branch information
Jiri Slaby authored and ozbenh committed Jan 15, 2010
1 parent c81b812 commit 4bf936b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/mm/mmap_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static inline int mmap_is_legacy(void)
if (current->personality & ADDR_COMPAT_LAYOUT)
return 1;

if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)
if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
return 1;

return sysctl_legacy_va_layout;
Expand Down Expand Up @@ -77,7 +77,7 @@ static unsigned long mmap_rnd(void)

static inline unsigned long mmap_base(void)
{
unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
unsigned long gap = rlimit(RLIMIT_STACK);

if (gap < MIN_GAP)
gap = MIN_GAP;
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/cell/spufs/coredump.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static ssize_t do_coredump_read(int num, struct spu_context *ctx, void *buffer,
*/
static int spufs_dump_write(struct file *file, const void *addr, int nr, loff_t *foffset)
{
unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
unsigned long limit = rlimit(RLIMIT_CORE);
ssize_t written;

if (*foffset + nr > limit)
Expand Down

0 comments on commit 4bf936b

Please sign in to comment.