diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/s390/mm/mmap.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
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 f4558ccf02b..869efbaed3e 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 |