Merge branch 'linus' into stackprotector

[linux-2.6-omap-h63xx.git] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 2be1e6b8e18b82c33d22a6812336192df8ab0543..28f111461ca8fd7ff672cd930ff7286741574224 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -114,21 +114,10 @@ config DEBUG_RODATA
          data. This is recommended so that we can catch kernel bugs sooner.
          If in doubt, say "Y".
 
-config DIRECT_GBPAGES
-       bool "Enable gbpages-mapped kernel pagetables"
-       depends on DEBUG_KERNEL && EXPERIMENTAL && X86_64
-       help
-         Enable gigabyte pages support (if the CPU supports it). This can
-         improve the kernel's performance a tiny bit by reducing TLB
-         pressure.
-
-         This is experimental code.
-
-         If in doubt, say "N".
-
 config DEBUG_RODATA_TEST
        bool "Testcase for the DEBUG_RODATA feature"
        depends on DEBUG_RODATA
+       default y
        help
          This option enables a testcase for the DEBUG_RODATA
          feature as well as for the change_page_attr() infrastructure.
@@ -186,14 +175,10 @@ config IOMMU_LEAK
          Add a simple leak tracer to the IOMMU code. This is useful when you
          are debugging a buggy device driver that leaks IOMMU mappings.
 
-config MMIOTRACE_HOOKS
-       bool
-
 config MMIOTRACE
        bool "Memory mapped IO tracing"
        depends on DEBUG_KERNEL && PCI
        select TRACING
-       select MMIOTRACE_HOOKS
        help
          Mmiotrace traces Memory Mapped I/O access and is meant for
          debugging and reverse engineering. It is called from the ioremap