diff options
| author | Jan Beulich <JBeulich@suse.com> | 2012-09-10 12:41:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-13 17:45:33 +0200 |
| commit | 3120e25efdc0834c88e1c0f8394e2087444f8c19 (patch) | |
| tree | c9830547896f4d84ea9063bf2d7cdd5ab6f4e143 /arch/x86/Kconfig.cpu | |
| parent | c206b9dcb1fc41b104db43e98f9b83a8c0c559ae (diff) | |
| download | linux-stable-3120e25efdc0834c88e1c0f8394e2087444f8c19.tar.gz linux-stable-3120e25efdc0834c88e1c0f8394e2087444f8c19.tar.bz2 linux-stable-3120e25efdc0834c88e1c0f8394e2087444f8c19.zip | |
x86/Kconfig: Clean up Kconfig defaults
The main goal here is to have the resulting .config no carry any
options that aren't enabled and can't be (i.e such where the
default is "no" and can't be changed), so that if any such
option later gets a user visible prompt, the user will actually
be prompted on a "make ...oldconfig" rather than keeping the
previously invisible option disabled.
There's a little bit of other trivial cleanup mixed in here.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/504DEE19020000780009A285@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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" |