diff options
author | Jiri Slaby <jslaby@suse.cz> | 2010-01-13 14:44:33 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-01-13 14:44:45 -0500 |
commit | a58c26bba9ebe97fea99aee125728b1f3886499e (patch) | |
tree | a4f989ee10aee76712eb93899ae99d9201d40966 | |
parent | 16e1a577693a470367287281765b7daad0998fc1 (diff) |
[S390] use helpers for rlimits
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
3e10e716abf3c71bdb5d86b8f507f9e72236c9cd
or ACCESS_ONCE if not applicable.
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/mm/mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index f4558ccf02b9..869efbaed3ea 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | static inline unsigned long mmap_base(void) | 41 | static inline unsigned long mmap_base(void) |
42 | { | 42 | { |
43 | unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; | 43 | unsigned long gap = rlimit(RLIMIT_STACK); |
44 | 44 | ||
45 | if (gap < MIN_GAP) | 45 | if (gap < MIN_GAP) |
46 | gap = MIN_GAP; | 46 | gap = MIN_GAP; |
@@ -61,7 +61,7 @@ static inline int mmap_is_legacy(void) | |||
61 | #endif | 61 | #endif |
62 | return sysctl_legacy_va_layout || | 62 | return sysctl_legacy_va_layout || |
63 | (current->personality & ADDR_COMPAT_LAYOUT) || | 63 | (current->personality & ADDR_COMPAT_LAYOUT) || |
64 | current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY; | 64 | rlimit(RLIMIT_STACK) == RLIM_INFINITY; |
65 | } | 65 | } |
66 | 66 | ||
67 | #ifndef CONFIG_64BIT | 67 | #ifndef CONFIG_64BIT |