diff options
author | Arjan van de Ven <arjan@infradead.org> | 2009-10-11 10:33:02 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-12 13:06:57 +0200 |
commit | c03cb3149daed3e411657e3212d05ae27cf1a874 (patch) | |
tree | 4a3d731dbb36e97b2ed0b1b53b2f765fc9bfd48b /arch/x86/Kconfig | |
parent | d93a8f829fe1d2f3002f2c6ddb553d12db420412 (diff) | |
download | linux-c03cb3149daed3e411657e3212d05ae27cf1a874.tar.gz linux-c03cb3149daed3e411657e3212d05ae27cf1a874.tar.bz2 linux-c03cb3149daed3e411657e3212d05ae27cf1a874.zip |
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/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 7 |
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 kernel, it won't hurt. config MTRR - bool "MTRR (Memory Type Range Register) support" + bool + default y + prompt "MTRR (Memory Type Range Register) support" if EMBEDDED ---help--- On Intel P6 family processors (Pentium Pro, Pentium II and later) the Memory Type Range Registers (MTRRs) may be used to control @@ -1387,7 +1389,8 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT config X86_PAT bool - prompt "x86 PAT support" + default y + prompt "x86 PAT support" if EMBEDDED depends on MTRR ---help--- Use PAT attributes to setup page level cache control. |