Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=409a7b859ddb6e0a615d9f3ccddedaec218c56b6
Commit:     409a7b859ddb6e0a615d9f3ccddedaec218c56b6
Parent:     1b000a5dbeb2f34bc03d45ebdf3f6d24a60c3aed
Author:     Mel Gorman <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:33:25 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:33:25 2008 +0100

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dc80a9f..2114b4c 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to