From 409a7b859ddb6e0a615d9f3ccddedaec218c56b6 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Wed, 30 Jan 2008 13:33:25 +0100 Subject: [PATCH] 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 --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dc80a9f1f303..2114b4c71fa0 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 -- 2.20.1