Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / mips / mm / mmap.c

diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
index d08ea3ff0f53345e7501dd168f32c2177976f6ee..d6d92c02308dd8790f073cc20d64bd2447ec0ae4 100644 (file)
--- a/arch/mips/mm/mmap.c
+++ b/arch/mips/mm/mmap.c
@@ -146,14 +146,14 @@ unsigned long arch_mmap_rnd(void)
 {
        unsigned long rnd;
 
-       rnd = get_random_long();
-       rnd <<= PAGE_SHIFT;
+#ifdef CONFIG_COMPAT
        if (TASK_IS_32BIT_ADDR)
-               rnd &= 0xfffffful;
+               rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1);
        else
-               rnd &= 0xffffffful;
+#endif /* CONFIG_COMPAT */
+               rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1);
 
-       return rnd;
+       return rnd << PAGE_SHIFT;
 }
 
 void arch_pick_mmap_layout(struct mm_struct *mm)