aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig23
1 files changed, 10 insertions, 13 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6958d6bcaf70..96e0c2ebc388 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -170,6 +170,7 @@ config GENERIC_PENDING_IRQ
170config X86_SMP 170config X86_SMP
171 bool 171 bool
172 depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) 172 depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
173 select USE_GENERIC_SMP_HELPERS
173 default y 174 default y
174 175
175config X86_32_SMP 176config X86_32_SMP
@@ -447,7 +448,6 @@ config PARAVIRT_DEBUG
447config MEMTEST 448config MEMTEST
448 bool "Memtest" 449 bool "Memtest"
449 depends on X86_64 450 depends on X86_64
450 default y
451 help 451 help
452 This option adds a kernel parameter 'memtest', which allows memtest 452 This option adds a kernel parameter 'memtest', which allows memtest
453 to be set. 453 to be set.
@@ -455,7 +455,7 @@ config MEMTEST
455 memtest=1, mean do 1 test pattern; 455 memtest=1, mean do 1 test pattern;
456 ... 456 ...
457 memtest=4, mean do 4 test patterns. 457 memtest=4, mean do 4 test patterns.
458 If you are unsure how to answer this question, answer Y. 458 If you are unsure how to answer this question, answer N.
459 459
460config X86_SUMMIT_NUMA 460config X86_SUMMIT_NUMA
461 def_bool y 461 def_bool y
@@ -1135,21 +1135,18 @@ config MTRR
1135 See <file:Documentation/mtrr.txt> for more information. 1135 See <file:Documentation/mtrr.txt> for more information.
1136 1136
1137config MTRR_SANITIZER 1137config MTRR_SANITIZER
1138 def_bool y 1138 bool
1139 prompt "MTRR cleanup support" 1139 prompt "MTRR cleanup support"
1140 depends on MTRR 1140 depends on MTRR
1141 help 1141 help
1142 Convert MTRR layout from continuous to discrete, so some X driver 1142 Convert MTRR layout from continuous to discrete, so X drivers can
1143 could add WB entries. 1143 add writeback entries.
1144 1144
1145 Say N here if you see bootup problems (boot crash, boot hang, 1145 Can be disabled with disable_mtrr_cleanup on the kernel command line.
1146 spontaneous reboots). 1146 The largest mtrr entry size for a continous block can be set with
1147 mtrr_chunk_size.
1147 1148
1148 Could be disabled with disable_mtrr_cleanup. Also mtrr_chunk_size 1149 If unsure, say N.
1149 could be used to send largest mtrr entry size for continuous block
1150 to hold holes (aka. UC entries)
1151
1152 If unsure, say Y.
1153 1150
1154config MTRR_SANITIZER_ENABLE_DEFAULT 1151config MTRR_SANITIZER_ENABLE_DEFAULT
1155 int "MTRR cleanup enable value (0-1)" 1152 int "MTRR cleanup enable value (0-1)"
@@ -1166,7 +1163,7 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
1166 depends on MTRR_SANITIZER 1163 depends on MTRR_SANITIZER
1167 help 1164 help
1168 mtrr cleanup spare entries default, it can be changed via 1165 mtrr cleanup spare entries default, it can be changed via
1169 mtrr_spare_reg_nr= 1166 mtrr_spare_reg_nr=N on the kernel command line.
1170 1167
1171config X86_PAT 1168config X86_PAT
1172 bool 1169 bool