diff options
| author | Mel Gorman <mel@csn.ul.ie> | 2008-01-30 07:33:25 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:25 -0500 |
| commit | 409a7b859ddb6e0a615d9f3ccddedaec218c56b6 (patch) | |
| tree | cf857ff09c25edf386fb3dfba16a22054568be3b | |
| parent | 1b000a5dbeb2f34bc03d45ebdf3f6d24a60c3aed (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>
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 871 | 871 | ||
| 872 | config ARCH_FLATMEM_ENABLE | 872 | config ARCH_FLATMEM_ENABLE |
| 873 | def_bool y | 873 | def_bool y |
| 874 | depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && X86_PC | 874 | depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && X86_PC && !NUMA |
| 875 | 875 | ||
| 876 | config ARCH_DISCONTIGMEM_ENABLE | 876 | config ARCH_DISCONTIGMEM_ENABLE |
| 877 | def_bool y | 877 | def_bool y |