x86: mtrr cleanup for converting continuous to discrete layout, v8

[linux-2.6] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 80303187b872bd29a8c30f490c9bb74d93f5a2e0..97a1764a3d20b6a03f0469709a8e0bfe000fbd06 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -18,6 +18,7 @@ config X86_64
 ### Arch settings
 config X86
        def_bool y
+       select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
@@ -25,6 +26,18 @@ config X86
        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
        select HAVE_ARCH_KGDB if !X86_VOYAGER
 
+config DEFCONFIG_LIST
+       string
+       depends on X86_32
+       option defconfig_list
+       default "arch/x86/configs/i386_defconfig"
+
+config DEFCONFIG_LIST
+       string
+       depends on X86_64
+       option defconfig_list
+       default "arch/x86/configs/x86_64_defconfig"
+
 
 config GENERIC_LOCKBREAK
        def_bool n
@@ -322,6 +335,7 @@ config X86_RDC321X
        select GENERIC_GPIO
        select LEDS_CLASS
        select LEDS_GPIO
+       select NEW_LEDS
        help
          This option is needed for RDC R-321x system-on-chip, also known
          as R-8610-(G).
@@ -1078,6 +1092,32 @@ config MTRR
 
          See <file:Documentation/mtrr.txt> for more information.
 
+config MTRR_SANITIZER
+       def_bool y
+       prompt "MTRR cleanup support"
+       depends on MTRR
+       help
+         Convert MTRR layout from continuous to discrete, so some X driver
+         could add WB entries.
+
+         Say N here if you see bootup problems (boot crash, boot hang,
+         spontaneous reboots).
+
+         Could be disabled with disable_mtrr_cleanup. Also mtrr_chunk_size
+         could be used to send largest mtrr entry size for continuous block
+         to hold holes (aka. UC entries)
+
+         If unsure, say Y.
+
+config MTRR_SANITIZER_ENABLE_DEFAULT
+       def_bool y
+       prompt "Enable MTRR cleanup by default"
+       depends on MTRR_SANITIZER
+       help
+         Enable mtrr cleanup by default
+
+         If unsure, say Y.
+
 config X86_PAT
        bool
        prompt "x86 PAT support"