Merge branch 'master' of /home/src/linux-2.6/

[pandora-kernel.git] / arch / x86_64 / Kconfig.debug

diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug
index d584ecc..ea31b4c 100644 (file)
--- a/arch/x86_64/Kconfig.debug
+++ b/arch/x86_64/Kconfig.debug
@@ -2,21 +2,15 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
-# !SMP for now because the context switch early causes GPF in segment reloading
-# and the GS base checking does the wrong thing then, causing a hang.
-config CHECKING
-       bool "Additional run-time checks"
-       depends on DEBUG_KERNEL && !SMP
-       help
-         Enables some internal consistency checks for kernel debugging.
-         You should normally say N.
-
-config INIT_DEBUG
-       bool "Debug __init statements"
-       depends on DEBUG_KERNEL
-       help
-         Fill __init and __initdata at the end of boot. This helps debugging
-         illegal uses of __init and __initdata after initialization.
+config DEBUG_RODATA
+       bool "Write protect kernel read-only data structures"
+       depends on DEBUG_KERNEL
+       help
+        Mark the kernel read-only data as write-protected in the pagetables,
+        in order to catch accidental (and incorrect) writes to such const data.
+        This option may have a slight performance impact because a portion
+        of the kernel code won't be covered by a 2MB TLB anymore.
+        If in doubt, say "N".
 
 config IOMMU_DEBUG
        depends on GART_IOMMU && DEBUG_KERNEL