[folded-merged] arm-mm-support-arch_mmap_rnd_bits-v5.patch removed from -mm tree

[folded-merged] arm-mm-support-arch_mmap_rnd_bits-v5.patch removed from -mm tree

[akpm]

The patch titled
     Subject: arm-mm-support-arch_mmap_rnd_bits-v5
has been removed from the -mm tree.  Its filename was
     arm-mm-support-arch_mmap_rnd_bits-v5.patch

This patch was dropped because it was folded into arm-mm-support-arch_mmap_rnd_bits.patch

------------------------------------------------------
From: Daniel Cashman <dcashman@android.com>
Subject: arm-mm-support-arch_mmap_rnd_bits-v5

Signed-off-by: Daniel Cashman <dcashman@android.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/Kconfig |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff -puN arch/arm/Kconfig~arm-mm-support-arch_mmap_rnd_bits-v5 arch/arm/Kconfig
--- a/arch/arm/Kconfig~arm-mm-support-arch_mmap_rnd_bits-v5
+++ a/arch/arm/Kconfig
@@ -313,10 +313,9 @@ config ARCH_MMAP_RND_BITS_MIN
 	default 8
 
 config ARCH_MMAP_RND_BITS_MAX
-	default 14 if MMU && PAGE_OFFSET=0x40000000
-	default 15 if MMU && PAGE_OFFSET=0x80000000
-	default 16 if MMU
-	default 8
+	default 14 if PAGE_OFFSET=0x40000000
+	default 15 if PAGE_OFFSET=0x80000000
+	default 16
 
 #
 # The "ARM system type" choice list is ordered alphabetically by option
_

Patches currently in -mm which might be from dcashman@android.com are

arm-mm-support-arch_mmap_rnd_bits.patch
arm64-mm-support-arch_mmap_rnd_bits-v4.patch
arm64-mm-support-arch_mmap_rnd_bits-v5.patch
x86-mm-support-arch_mmap_rnd_bits-v5.patch