Skip to content

Commit

Permalink
i386: Make CMPXCHG64 only dependent on PAE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Jun 23, 2007
1 parent 3f2c6d0 commit 9d9bbd4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/i386/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion arch/i386/Kconfig.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9d9bbd4

Please sign in to comment.