From 3d3949c65859387a8474d8a7272b55b4e87aa074 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 6 Apr 2012 14:47:35 +0200
Subject: [PATCH] --- yaml --- r: 305475 b: refs/heads/master c:
 302616911da8e868d3f1a00dce517ca30b0e065d h: refs/heads/master i:   305473:
 10149f1a4f35116ab48d9607811a5755b513a600   305471:
 9d7e2058b00a5655514059397374dca047b9fdf5 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/Kconfig                 | 4 ----
 trunk/arch/x86/include/asm/mmzone_32.h | 6 ------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index f7e9e05e8009..3d74e9b240a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6fca40f1d7f3e232c9de27c1cebbb9f787fbc4f
+refs/heads/master: 302616911da8e868d3f1a00dce517ca30b0e065d
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 5bed94e189fa..a105ee75bd85 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1255,10 +1255,6 @@ config NODES_SHIFT
 	  Specify the maximum number of NUMA Nodes available on the target
 	  system.  Increases memory reserved to accommodate various tables.
 
-config HAVE_ARCH_BOOTMEM
-	def_bool y
-	depends on X86_32 && NUMA
-
 config HAVE_ARCH_ALLOC_REMAP
 	def_bool y
 	depends on X86_32 && NUMA
diff --git a/trunk/arch/x86/include/asm/mmzone_32.h b/trunk/arch/x86/include/asm/mmzone_32.h
index 55728e121473..eb05fb3b02fb 100644
--- a/trunk/arch/x86/include/asm/mmzone_32.h
+++ b/trunk/arch/x86/include/asm/mmzone_32.h
@@ -61,10 +61,4 @@ static inline int pfn_valid(int pfn)
 
 #endif /* CONFIG_DISCONTIGMEM */
 
-#ifdef CONFIG_NEED_MULTIPLE_NODES
-/* always use node 0 for bootmem on this numa platform */
-#define bootmem_arch_preferred_node(__bdata, size, align, goal, limit)	\
-	(NODE_DATA(0)->bdata)
-#endif /* CONFIG_NEED_MULTIPLE_NODES */
-
 #endif /* _ASM_X86_MMZONE_32_H */