diff options
Diffstat (limited to 'arch/x86/Kconfig.cpu')
-rw-r--r-- | arch/x86/Kconfig.cpu | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 8eb50ba9161e..085fef4d8660 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
@@ -167,9 +167,9 @@ config MK7 | |||
167 | config MK8 | 167 | config MK8 |
168 | bool "Opteron/Athlon64/Hammer/K8" | 168 | bool "Opteron/Athlon64/Hammer/K8" |
169 | help | 169 | help |
170 | Select this for an AMD Opteron or Athlon64 Hammer-family processor. Enables | 170 | Select this for an AMD Opteron or Athlon64 Hammer-family processor. |
171 | use of some extended instructions, and passes appropriate optimization | 171 | Enables use of some extended instructions, and passes appropriate |
172 | flags to GCC. | 172 | optimization flags to GCC. |
173 | 173 | ||
174 | config MCRUSOE | 174 | config MCRUSOE |
175 | bool "Crusoe" | 175 | bool "Crusoe" |
@@ -256,9 +256,11 @@ config MPSC | |||
256 | config MCORE2 | 256 | config MCORE2 |
257 | bool "Core 2/newer Xeon" | 257 | bool "Core 2/newer Xeon" |
258 | help | 258 | help |
259 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and 53xx) | 259 | |
260 | CPUs. You can distinguish newer from older Xeons by the CPU family | 260 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and |
261 | in /proc/cpuinfo. Newer ones have 6 and older ones 15 (not a typo) | 261 | 53xx) CPUs. You can distinguish newer from older Xeons by the CPU |
262 | family in /proc/cpuinfo. Newer ones have 6 and older ones 15 | ||
263 | (not a typo) | ||
262 | 264 | ||
263 | config GENERIC_CPU | 265 | config GENERIC_CPU |
264 | bool "Generic-x86-64" | 266 | bool "Generic-x86-64" |
@@ -318,14 +320,14 @@ config X86_PPRO_FENCE | |||
318 | bool "PentiumPro memory ordering errata workaround" | 320 | bool "PentiumPro memory ordering errata workaround" |
319 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 | 321 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 |
320 | help | 322 | help |
321 | Old PentiumPro multiprocessor systems had errata that could cause memory | 323 | Old PentiumPro multiprocessor systems had errata that could cause |
322 | operations to violate the x86 ordering standard in rare cases. Enabling this | 324 | memory operations to violate the x86 ordering standard in rare cases. |
323 | option will attempt to work around some (but not all) occurances of | 325 | Enabling this option will attempt to work around some (but not all) |
324 | this problem, at the cost of much heavier spinlock and memory barrier | 326 | occurances of this problem, at the cost of much heavier spinlock and |
325 | operations. | 327 | memory barrier operations. |
326 | 328 | ||
327 | If unsure, say n here. Even distro kernels should think twice before enabling | 329 | If unsure, say n here. Even distro kernels should think twice before |
328 | this: there are few systems, and an unlikely bug. | 330 | enabling this: there are few systems, and an unlikely bug. |
329 | 331 | ||
330 | config X86_F00F_BUG | 332 | config X86_F00F_BUG |
331 | def_bool y | 333 | def_bool y |