---

yaml --- r: 80371 b: refs/heads/master c: 409a7b8 h: refs/heads/master i: 80369: bde4388 80367: f693ba0 v: v3
git-mirror · Jan 30, 2008 · b9c6cbd · b9c6cbd
1 parent 8df8763
commit b9c6cbd
Show file tree

Hide file tree

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