diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
| commit | 3fb42daaf11c4be8e0626b733916f3a7b65bcfae (patch) | |
| tree | d40ab1904047d2db03c9f6e9b538e01d62415646 /arch/s390/kernel/process.c | |
| parent | efdbe3c3edb6c8c98a8be863f60916780a5375c1 (diff) | |
| parent | 06a691e64b11323a735db3c3bd909d3c0712698f (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/s390/kernel/process.c')
| -rw-r--r-- | arch/s390/kernel/process.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 688a3aad9c79..114ee8b96f17 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c @@ -243,11 +243,7 @@ unsigned long arch_align_stack(unsigned long sp) static inline unsigned long brk_rnd(void) { - /* 8MB for 32bit, 1GB for 64bit */ - if (is_32bit_task()) - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT; - else - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT; + return (get_random_int() & BRK_RND_MASK) << PAGE_SHIFT; } unsigned long arch_randomize_brk(struct mm_struct *mm) |