---

yaml --- r: 110395 b: refs/heads/master c: 9980996 h: refs/heads/master i: 110393: f13a33e 110391: e00ee2b v: v3
git-mirror · Aug 11, 2008 · b852c3f · b852c3f
1 parent 693d7a6
commit b852c3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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