diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-07 09:27:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-07 09:27:30 +0100 |
| commit | ec87e1cf7d8399d81d8965c6d852f8057a8dd687 (patch) | |
| tree | 472a168fa4861090edf110c8a9712a5c15ea259f /arch/mips/mm/mmap.c | |
| parent | 869ae76147ffdf21ad24f0e599303cd58a2bb39f (diff) | |
| parent | f6cede5b49e822ebc41a099fe41ab4989f64e2cb (diff) | |
| download | op-kernel-dev-ec87e1cf7d8399d81d8965c6d852f8057a8dd687.zip op-kernel-dev-ec87e1cf7d8399d81d8965c6d852f8057a8dd687.tar.gz | |
Merge tag 'v4.5-rc7' into x86/asm, to pick up SMAP fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/mm/mmap.c')
| -rw-r--r-- | arch/mips/mm/mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c index 5c81fdd..3530376 100644 --- a/arch/mips/mm/mmap.c +++ b/arch/mips/mm/mmap.c @@ -146,7 +146,7 @@ unsigned long arch_mmap_rnd(void) { unsigned long rnd; - rnd = (unsigned long)get_random_int(); + rnd = get_random_long(); rnd <<= PAGE_SHIFT; if (TASK_IS_32BIT_ADDR) rnd &= 0xfffffful; @@ -174,7 +174,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm) static inline unsigned long brk_rnd(void) { - unsigned long rnd = get_random_int(); + unsigned long rnd = get_random_long(); rnd = rnd << PAGE_SHIFT; /* 8MB for 32bit, 256MB for 64bit */ |
