Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 156822e3cc797c80406e3516355a53e3d703d0a7..80598cfd728c39744c5841e0e5d0bbd078833dba 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -32,7 +32,7 @@ config MAGIC_SYSRQ
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
        range 12 21
-       default 17 if ARCH_S390
+       default 17 if S390
        default 16 if X86_NUMAQ || IA64
        default 15 if SMP
        default 14
@@ -172,7 +172,8 @@ config DEBUG_VM
        bool "Debug VM"
        depends on DEBUG_KERNEL
        help
-         Enable this to debug the virtual-memory system.
+         Enable this to turn on extended checks in the virtual-memory system
+          that may impact performance.
 
          If unsure, say N.