Commit 409a7b85 authored Jan 30, 2008 by Mel Gorman Committed by Ingo Molnar Jan 30, 2008

x86: relax restrictions on setting CONFIG_NUMA on x86, #2



The FLATMEM memory model references a global mem_map and max_mapnr. This
is incompatible with how memory models used for NUMA view the world.
Builds fail if FLATMEM && NUMA are set on x86. This patch forbids that
combination of config items. This is consistent with x86_64
enforcements.

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 1b000a5d

arch/x86/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -871,7 +871,7 @@ config HAVE_ARCH_ALLOC_REMAP

		config ARCH_FLATMEM_ENABLE
		def_bool y
		depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && X86_PC
		depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && X86_PC && !NUMA

		config ARCH_DISCONTIGMEM_ENABLE
		def_bool y