diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:47:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 10:47:11 -0700 |
| commit | 67b1f348c95e48aa80a58fbdca93a702b5afa69c (patch) | |
| tree | ff8547113bf37dbfd34549defe7ef5c10b791d8b /arch/x86/Kconfig.cpu | |
| parent | da8347969f324db5f572581397d9b3a8e108cda4 (diff) | |
| parent | 3120e25efdc0834c88e1c0f8394e2087444f8c19 (diff) | |
| download | lwn-67b1f348c95e48aa80a58fbdca93a702b5afa69c.tar.gz lwn-67b1f348c95e48aa80a58fbdca93a702b5afa69c.zip | |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/build changes from Ingo Molnar:
"defconfig and kconfig cleanups/fixes"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/Kconfig: Clean up Kconfig defaults
x86/Kconfig: Turn off DEBUG_NX_TEST module in defconfigs
x86/Kconfig: Turn off CONFIG_BLK_DEV_RAM
x86/Kconfig: Disable CONFIG_CRC_T10DIF in defconfigs
x86/Kconfig: Switch to ext4 in defconfigs
x86/Kconfig: Update defconfigs to current results of "make savedefconfig"
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 706e12e9984b..f3b86d0df44e 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -306,7 +306,8 @@ config X86_INTERNODE_CACHE_SHIFT default X86_L1_CACHE_SHIFT config X86_CMPXCHG - def_bool X86_64 || (X86_32 && !M386) + def_bool y + depends on X86_64 || (X86_32 && !M386) config X86_L1_CACHE_SHIFT int @@ -317,7 +318,7 @@ config X86_L1_CACHE_SHIFT config X86_XADD def_bool y - depends on X86_64 || !M386 + depends on !M386 config X86_PPRO_FENCE bool "PentiumPro memory ordering errata workaround" |