vserver 2.0 rc7

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

diff --git a/arch/i386/Kconfig.debug b/arch/i386/Kconfig.debug
index ffb6642..bfb2064 100644 (file)
--- a/arch/i386/Kconfig.debug
+++ b/arch/i386/Kconfig.debug
@@ -3,7 +3,7 @@ menu "Kernel hacking"
 source "lib/Kconfig.debug"
 
 config EARLY_PRINTK
-       bool "Early printk" if EMBEDDED
+       bool "Early printk" if EMBEDDED && DEBUG_KERNEL
        default y
        help
          Write kernel log output directly into the VGA buffer or to a serial
@@ -38,9 +38,12 @@ config DEBUG_STACK_USAGE
 
          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
+
 config DEBUG_PAGEALLOC
        bool "Page alloc debugging"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND
        help
          Unmap pages from the kernel linear mapping after free_pages().
          This results in a large slowdown, but helps to find certain types
@@ -48,6 +51,7 @@ config DEBUG_PAGEALLOC
 
 config 4KSTACKS
        bool "Use 4Kb for kernel stacks instead of 8Kb"
+       depends on DEBUG_KERNEL
        help
          If you say Y here the kernel will use a 4Kb stacksize for the
          kernel stack attached to each process/thread. This facilitates