Commit:     9d9bbd4d247a674deb43565582151acdc22e90d1
Parent:     3f2c6d0f4f0dafdc99af0df71edba57e7815cb13
Author:     Andi Kleen <[EMAIL PROTECTED]>
AuthorDate: Sat Jun 23 02:29:23 2007 +0200
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Jun 22 18:41:18 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/i386/Kconfig     |    2 +-
 arch/i386/Kconfig.cpu |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8770a5d..d2f6a24 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
          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 d7f6fb0..5c95ceb 100644
--- a/arch/i386/Kconfig.cpu
+++ b/arch/i386/Kconfig.cpu
@@ -299,7 +299,7 @@ config X86_POPAD_OK
 config X86_CMPXCHG64
-       depends on !M386 && !M486
+       depends on X86_PAE
        default y
 config X86_ALIGNMENT_16
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to