aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMel Gorman <mel@csn.ul.ie>2008-01-30 13:33:25 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:33:25 +0100
commit409a7b859ddb6e0a615d9f3ccddedaec218c56b6 (patch)
treecf857ff09c25edf386fb3dfba16a22054568be3b /arch
parent1b000a5dbeb2f34bc03d45ebdf3f6d24a60c3aed (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
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