diff options
| author | Alex Elder <aelder@sgi.com> | 2010-02-26 14:34:02 -0600 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-02-26 14:34:02 -0600 |
| commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
| tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /arch/s390/mm/mmap.c | |
| parent | d67b1b03254c501fef371b0e5916c94a52bfc2c5 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| download | kernel_goldelico_gta04-398007f863a4af2b4a5a07219c5a617f1a098115.zip kernel_goldelico_gta04-398007f863a4af2b4a5a07219c5a617f1a098115.tar.gz kernel_goldelico_gta04-398007f863a4af2b4a5a07219c5a617f1a098115.tar.bz2 | |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'arch/s390/mm/mmap.c')
| -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 f4558cc..869efba 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c @@ -40,7 +40,7 @@ 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; @@ -61,7 +61,7 @@ static inline int mmap_is_legacy(void) #endif return sysctl_legacy_va_layout || (current->personality & ADDR_COMPAT_LAYOUT) || - current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY; + rlimit(RLIMIT_STACK) == RLIM_INFINITY; } #ifndef CONFIG_64BIT |