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

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

[akpm]

The patch titled
     Subject: ARM: avoid ARCH_MMAP_RND_BITS for NOMMU
has been removed from the -mm tree.  Its filename was
     arm-mm-support-arch_mmap_rnd_bits-fix.patch

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

------------------------------------------------------
From: Arnd Bergmann <arnd@arndb.de>
Subject: ARM: avoid ARCH_MMAP_RND_BITS for NOMMU

ARM kernels with MMU disabled fail to build because of CONFIG_ARCH_MMAP_RND_BITS:

kernel/built-in.o:(.data+0x754): undefined reference to `mmap_rnd_bits'
kernel/built-in.o:(.data+0x76c): undefined reference to `mmap_rnd_bits_min'
kernel/built-in.o:(.data+0x770): undefined reference to `mmap_rnd_bits_max'

This changes the newly added line to only select this allow for
MMU-enabled kernels.

Fixes: 14570b3fd31a ("arm: mm: support ARCH_MMAP_RND_BITS")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Daniel Cashman <dcashman@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/arm/Kconfig~arm-mm-support-arch_mmap_rnd_bits-fix arch/arm/Kconfig
--- a/arch/arm/Kconfig~arm-mm-support-arch_mmap_rnd_bits-fix
+++ a/arch/arm/Kconfig
@@ -35,7 +35,7 @@ config ARM
 	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
 	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32
 	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32
-	select HAVE_ARCH_MMAP_RND_BITS
+	select HAVE_ARCH_MMAP_RND_BITS if MMU
 	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_BPF_JIT
_

Patches currently in -mm which might be from arnd@arndb.de are

include-define-__phys_to_pfn-as-phys_pfn-fix-2.patch
arm-mm-support-arch_mmap_rnd_bits.patch
arm-thp-remove-infrastructure-for-handling-splitting-pmds-fix.patch
memstick-use-sector_div-instead-of-do_div.patch