From b9c6cbd09dd74235e37e3952bb8319407910e73f Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Wed, 30 Jan 2008 13:33:25 +0100 Subject: [PATCH] --- yaml --- r: 80371 b: refs/heads/master c: 409a7b859ddb6e0a615d9f3ccddedaec218c56b6 h: refs/heads/master i: 80369: bde43885444cf59ff8b6892fb82bbfa44370008a 80367: f693ba0684ee14300243507b4bec56e00f2452d6 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 530b354bb2b1..c996533aabcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b000a5dbeb2f34bc03d45ebdf3f6d24a60c3aed +refs/heads/master: 409a7b859ddb6e0a615d9f3ccddedaec218c56b6 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index dc80a9f1f303..2114b4c71fa0 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/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