From: Mel Gorman Date: Wed, 30 Jan 2008 12:33:25 +0000 (+0100) Subject: x86: relax restrictions on setting CONFIG_NUMA on x86, #2 X-Git-Tag: v2.6.25-rc1~1143^2~204 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=409a7b859ddb6e0a615d9f3ccddedaec218c56b6;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dc80a9f1f30..2114b4c71fa 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -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