commit d4e809ea8cca0ae779706dd17a2d36af26efadca
author Larry Bassel <lbassel@codeaurora.org> Thu Sep 08 10:46:49 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:14:15 2011 -0700
tree 0c5103b84a56fd8a1ae4bef33302eca85a85c88c
parent b3e55c62ed450df70548e700b8939c00d1af1fbc

arm: add support for ARCH_POPULATES_NODE_MAP

ARCH_POPULATES_NODE_MAP is used by most of the other
architectures and allows finer-grained control of
how and where zones are placed.

Signed-off-by: Larry Bassel <lbassel@codeaurora.org>

Conflicts:

	arch/arm/mm/init.c

arch/arm/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5fbc034..eb9b463 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1593,6 +1593,10 @@
 	def_bool n
 	depends on MEMORY_HOTPLUG
 
+config ARCH_POPULATES_NODE_MAP
+	def_bool n
+	depends on MEMORY_HOTPLUG
+
 config DONT_RESERVE_FROM_MOVABLE_ZONE
 	def_bool y
 	depends on MEMORY_HOTPLUG