---

yaml --- r: 57965 b: refs/heads/master c: 9d9bbd4 h: refs/heads/master i: 57963: 4c562bb v: v3
git-mirror · Jun 23, 2007 · dc5412b · dc5412b
1 parent 666ac7a
commit dc5412b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f2c6d0f4f0dafdc99af0df71edba57e7815cb13
+refs/heads/master: 9d9bbd4d247a674deb43565582151acdc22e90d1
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
@@ -541,7 +541,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
 	bool "64GB"
-	depends on X86_CMPXCHG64
+	depends on !M386 && !M486
 	help
 	  Select this if you have a 32-bit processor and more than 4
 	  gigabytes of physical RAM.

diff --git a/trunk/arch/i386/Kconfig.cpu b/trunk/arch/i386/Kconfig.cpu
@@ -299,7 +299,7 @@ config X86_POPAD_OK
 
 config X86_CMPXCHG64
 	bool
-	depends on !M386 && !M486
+	depends on X86_PAE
 	default y
 
 config X86_ALIGNMENT_16