Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index f68cc6f215f8b1c9bff53c0f6668d4b792f3b30a..f03531eacdfbe6936e2a4f8808babcd6f29411e4 100644 (file)
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -36,11 +36,11 @@ config DEBUG_STACK_USAGE
          This option will slow down process creation somewhat.
 
 comment "Page alloc debug is incompatible with Software Suspend on i386"
          This option will slow down process creation somewhat.
 
 comment "Page alloc debug is incompatible with Software Suspend on i386"

-       depends on DEBUG_KERNEL && SOFTWARE_SUSPEND
+       depends on DEBUG_KERNEL && HIBERNATION

 
 config DEBUG_PAGEALLOC
        bool "Debug page memory allocations"
 
 config DEBUG_PAGEALLOC
        bool "Debug page memory allocations"

-       depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND && !HUGETLBFS
+       depends on DEBUG_KERNEL && !HIBERNATION && !HUGETLBFS

        help
          Unmap pages from the kernel linear mapping after free_pages().
          This results in a large slowdown, but helps to find certain types
        help
          Unmap pages from the kernel linear mapping after free_pages().
          This results in a large slowdown, but helps to find certain types


@@ -85,14 +85,4 @@ config DOUBLEFAULT
           option saves about 4k and might cause you much additional grey
           hair.
 
           option saves about 4k and might cause you much additional grey
           hair.
 

-config DEBUG_PARAVIRT
-       bool "Enable some paravirtualization debugging"
-       default y
-       depends on PARAVIRT && DEBUG_KERNEL
-       help
-         Currently deliberately clobbers regs which are allowed to be
-         clobbered in inlined paravirt hooks, even in native mode.
-         If turning this off solves a problem, then DISABLE_INTERRUPTS() or
-         ENABLE_INTERRUPTS() is lying about what registers can be clobbered.
-

 endmenu
 endmenu