x86: use remove_vm_are in ioremap_32 error path

[linux-2.6] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 0a82b889d76ea236f521477b680e2d79b01b253b..2a859a7e2d74dba797f43a252359d906d3ffbe9d 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -41,7 +41,6 @@ comment "Page alloc debug is incompatible with Software Suspend on i386"
 config DEBUG_PAGEALLOC
        bool "Debug page memory allocations"
        depends on DEBUG_KERNEL && !HIBERNATION && !HUGETLBFS
-       depends on X86_32
        help
          Unmap pages from the kernel linear mapping after free_pages().
          This results in a large slowdown, but helps to find certain types
@@ -61,13 +60,13 @@ config DEBUG_PER_CPU_MAPS
 
 config DEBUG_RODATA
        bool "Write protect kernel read-only data structures"
+       default y
        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".
+         data. This is recommended so that we can catch kernel bugs sooner.
+         If in doubt, say "Y".
 
 config 4KSTACKS
        bool "Use 4Kb for kernel stacks instead of 8Kb"
@@ -204,4 +203,10 @@ config DEBUG_BOOT_PARAMS
        help
          This option will cause struct boot_params to be exported via debugfs.
 
+config CPA_DEBUG
+       bool "CPA self test code"
+       depends on DEBUG_KERNEL
+       help
+         Do change_page_attr self tests at boot.
+
 endmenu