aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2009-10-11 13:33:02 -0400
committerIngo Molnar <mingo@elte.hu>2009-10-12 07:06:57 -0400
commitc03cb3149daed3e411657e3212d05ae27cf1a874 (patch)
tree4a3d731dbb36e97b2ed0b1b53b2f765fc9bfd48b /arch/x86
parentd93a8f829fe1d2f3002f2c6ddb553d12db420412 (diff)
x86: Relegate CONFIG_PAT and CONFIG_MTRR configurability to EMBEDDED
MTRR and PAT support (which got added to CPUs over 10 years ago) are no longer really optional in that more and more things are depending on PAT just working, including various drivers and newer versions of X. (to not even speak of MTRR) Having this as a regular config option just no longer makes sense. This patch relegates CONFIG_X86_PAT to the EMBEDDED category so ultra-embedded can still disable it if they really need to. Also-Suggested-by: Roland Dreier <rdreier@cisco.com> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br> LKML-Reference: <20091011103302.62bded41@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c876bace8fdc..a67363bbe825 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1321,7 +1321,9 @@ config MATH_EMULATION
1321 kernel, it won't hurt. 1321 kernel, it won't hurt.
1322 1322
1323config MTRR 1323config MTRR
1324 bool "MTRR (Memory Type Range Register) support" 1324 bool
1325 default y
1326 prompt "MTRR (Memory Type Range Register) support" if EMBEDDED
1325 ---help--- 1327 ---help---
1326 On Intel P6 family processors (Pentium Pro, Pentium II and later) 1328 On Intel P6 family processors (Pentium Pro, Pentium II and later)
1327 the Memory Type Range Registers (MTRRs) may be used to control 1329 the Memory Type Range Registers (MTRRs) may be used to control
@@ -1387,7 +1389,8 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
1387 1389
1388config X86_PAT 1390config X86_PAT
1389 bool 1391 bool
1390 prompt "x86 PAT support" 1392 default y
1393 prompt "x86 PAT support" if EMBEDDED
1391 depends on MTRR 1394 depends on MTRR
1392 ---help--- 1395 ---help---
1393 Use PAT attributes to setup page level cache control. 1396 Use PAT attributes to setup page level cache control.