aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-07-15 08:48:48 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-07-15 09:30:28 -0400
commitaba3728ce2e8ce85e1e5f6b275131e9332256789 (patch)
treef216fb494002ac085aa512eb51ad3d0a6af1be3c /arch/x86
parent91d0322bef047e2916b3e52741411bffc63929cb (diff)
x86: sanitize Kconfig
Set default n for MEMTEST and MTRR_SANITIZER and fix the help texts. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig22
1 files changed, 9 insertions, 13 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6958d6bcaf70..2642b4bf41b9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -447,7 +447,6 @@ config PARAVIRT_DEBUG
447config MEMTEST 447config MEMTEST
448 bool "Memtest" 448 bool "Memtest"
449 depends on X86_64 449 depends on X86_64
450 default y
451 help 450 help
452 This option adds a kernel parameter 'memtest', which allows memtest 451 This option adds a kernel parameter 'memtest', which allows memtest
453 to be set. 452 to be set.
@@ -455,7 +454,7 @@ config MEMTEST
455 memtest=1, mean do 1 test pattern; 454 memtest=1, mean do 1 test pattern;
456 ... 455 ...
457 memtest=4, mean do 4 test patterns. 456 memtest=4, mean do 4 test patterns.
458 If you are unsure how to answer this question, answer Y. 457 If you are unsure how to answer this question, answer N.
459 458
460config X86_SUMMIT_NUMA 459config X86_SUMMIT_NUMA
461 def_bool y 460 def_bool y
@@ -1135,21 +1134,18 @@ config MTRR
1135 See <file:Documentation/mtrr.txt> for more information. 1134 See <file:Documentation/mtrr.txt> for more information.
1136 1135
1137config MTRR_SANITIZER 1136config MTRR_SANITIZER
1138 def_bool y 1137 bool
1139 prompt "MTRR cleanup support" 1138 prompt "MTRR cleanup support"
1140 depends on MTRR 1139 depends on MTRR
1141 help 1140 help
1142 Convert MTRR layout from continuous to discrete, so some X driver 1141 Convert MTRR layout from continuous to discrete, so X drivers can
1143 could add WB entries. 1142 add writeback entries.
1144 1143
1145 Say N here if you see bootup problems (boot crash, boot hang, 1144 Can be disabled with disable_mtrr_cleanup on the kernel command line.
1146 spontaneous reboots). 1145 The largest mtrr entry size for a continous block can be set with
1146 mtrr_chunk_size.
1147 1147
1148 Could be disabled with disable_mtrr_cleanup. Also mtrr_chunk_size 1148 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 1149
1154config MTRR_SANITIZER_ENABLE_DEFAULT 1150config MTRR_SANITIZER_ENABLE_DEFAULT
1155 int "MTRR cleanup enable value (0-1)" 1151 int "MTRR cleanup enable value (0-1)"
@@ -1166,7 +1162,7 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
1166 depends on MTRR_SANITIZER 1162 depends on MTRR_SANITIZER
1167 help 1163 help
1168 mtrr cleanup spare entries default, it can be changed via 1164 mtrr cleanup spare entries default, it can be changed via
1169 mtrr_spare_reg_nr= 1165 mtrr_spare_reg_nr=N on the kernel command line.
1170 1166
1171config X86_PAT 1167config X86_PAT
1172 bool 1168 bool