diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:41:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:41:35 -0800 |
| commit | d6cd4715e21508bebbb1928c91d628bd65f5de5f (patch) | |
| tree | 2b89de4d36032bdd3d56fbae6e0d626c2cdd38b8 /arch/x86/Kconfig.cpu | |
| parent | 1eca9acbf9cda6437db7de1097c7a18014b1289d (diff) | |
| parent | 0d1622d7f526311d87d7da2ee7dd14b73e45d3fc (diff) | |
| download | lwn-d6cd4715e21508bebbb1928c91d628bd65f5de5f.tar.gz lwn-d6cd4715e21508bebbb1928c91d628bd65f5de5f.zip | |
Merge branch 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-rwsem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-64, rwsem: Avoid store forwarding hazard in __downgrade_write
x86-64, rwsem: 64-bit xadd rwsem implementation
x86: Fix breakage of UML from the changes in the rwsem system
x86-64: support native xadd rwsem implementation
x86: clean up rwsem type system
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index f20ddf84a893..a19829374e6a 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -319,7 +319,7 @@ config X86_L1_CACHE_SHIFT config X86_XADD def_bool y - depends on X86_32 && !M386 + depends on X86_64 || !M386 config X86_PPRO_FENCE bool "PentiumPro memory ordering errata workaround" |