From b852c3f0fc11a3d9cbdec8f44ea2ab13055d6e7d Mon Sep 17 00:00:00 2001 From: Jeff Chua Date: Wed, 6 Aug 2008 19:09:53 +0800 Subject: [PATCH] --- yaml --- r: 110395 b: refs/heads/master c: 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f h: refs/heads/master i: 110393: f13a33e7900139be5e3cc10b8d297a322b869875 110391: e00ee2bf039ccb68327d5ce3acc0987a7b3876f2 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b99b763af5d4..36db1a7bb15d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2556896597c43cb48f04b1c16214938a6ccce9a +refs/heads/master: 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 7917962ab7ff..e2305c7d881b 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -1035,7 +1035,7 @@ config HAVE_ARCH_ALLOC_REMAP config ARCH_FLATMEM_ENABLE def_bool y - depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && X86_PC && !NUMA + depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && !NUMA config ARCH_DISCONTIGMEM_ENABLE def_bool y @@ -1051,7 +1051,7 @@ config ARCH_SPARSEMEM_DEFAULT config ARCH_SPARSEMEM_ENABLE def_bool y - depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) + depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_GENERICARCH select SPARSEMEM_STATIC if X86_32 select SPARSEMEM_VMEMMAP_ENABLE if X86_64