diff options
-rw-r--r-- | arch/x86/Kconfig | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/mmzone_32.h | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5bed94e189fa..a105ee75bd85 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1255,10 +1255,6 @@ config NODES_SHIFT | |||
1255 | Specify the maximum number of NUMA Nodes available on the target | 1255 | Specify the maximum number of NUMA Nodes available on the target |
1256 | system. Increases memory reserved to accommodate various tables. | 1256 | system. Increases memory reserved to accommodate various tables. |
1257 | 1257 | ||
1258 | config HAVE_ARCH_BOOTMEM | ||
1259 | def_bool y | ||
1260 | depends on X86_32 && NUMA | ||
1261 | |||
1262 | config HAVE_ARCH_ALLOC_REMAP | 1258 | config HAVE_ARCH_ALLOC_REMAP |
1263 | def_bool y | 1259 | def_bool y |
1264 | depends on X86_32 && NUMA | 1260 | depends on X86_32 && NUMA |
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index 55728e121473..eb05fb3b02fb 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h | |||
@@ -61,10 +61,4 @@ static inline int pfn_valid(int pfn) | |||
61 | 61 | ||
62 | #endif /* CONFIG_DISCONTIGMEM */ | 62 | #endif /* CONFIG_DISCONTIGMEM */ |
63 | 63 | ||
64 | #ifdef CONFIG_NEED_MULTIPLE_NODES | ||
65 | /* always use node 0 for bootmem on this numa platform */ | ||
66 | #define bootmem_arch_preferred_node(__bdata, size, align, goal, limit) \ | ||
67 | (NODE_DATA(0)->bdata) | ||
68 | #endif /* CONFIG_NEED_MULTIPLE_NODES */ | ||
69 | |||
70 | #endif /* _ASM_X86_MMZONE_32_H */ | 64 | #endif /* _ASM_X86_MMZONE_32_H */ |