summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-06-23 02:29:23 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-22 18:41:18 -0700
commit9d9bbd4d247a674deb43565582151acdc22e90d1 (patch)
tree1bab60b6457812b10dd62f8bbddb7985b53d5495 /arch
parent3f2c6d0f4f0dafdc99af0df71edba57e7815cb13 (diff)
downloadkernel-crypto-9d9bbd4d247a674deb43565582151acdc22e90d1.tar.gz
kernel-crypto-9d9bbd4d247a674deb43565582151acdc22e90d1.tar.xz
kernel-crypto-9d9bbd4d247a674deb43565582151acdc22e90d1.zip
i386: Make CMPXCHG64 only dependent on PAE
It is only used for PAE kernels in set_64bit. The problem is that due to a old Windows bug many CPUs need magic MSRs to enable CMPXCHG64, and we can't do that nicely early enough before it is potentially used. But since we only need it in PAE kernels so only force the checking for CMPXCHG65 with PAE. This fixes a boot failure on Transmeta Crusoe Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/Kconfig2
-rw-r--r--arch/i386/Kconfig.cpu2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8770a5d0b14..d2f6a247414 100644
--- a/arch/i386/Kconfig
+++ b/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/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu
index d7f6fb0b30f..5c95ceb7f12 100644
--- a/arch/i386/Kconfig.cpu
+++ b/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