Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[sfrench/cifs-2.6.git] / arch / um / Kconfig.debug

diff --git a/arch/um/Kconfig.debug b/arch/um/Kconfig.debug
index bd41e4286d0d4b743fafc74a993f167c7cac0955..c86f5eb29fd584619a807e4c10520a40fa81b6eb 100644 (file)
--- a/arch/um/Kconfig.debug
+++ b/arch/um/Kconfig.debug
@@ -2,6 +2,17 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
+config CMDLINE_ON_HOST
+       bool "Show command line arguments on the host in TT mode"
+       depends on MODE_TT
+       default !DEBUG_INFO
+       help
+       This controls whether arguments in guest processes should be shown on
+       the host's ps output.
+       Enabling this option hinders debugging on some recent GDB versions
+       (because GDB gets "confused" when we do an execvp()). So probably you
+       should disable it.
+
 config PT_PROXY
        bool "Enable ptrace proxy"
        depends on XTERM_CHAN && DEBUG_INFO && MODE_TT
@@ -36,14 +47,13 @@ config GCOV
         If you're involved in UML kernel development and want to use gcov,
         say Y.  If you're unsure, say N.
 
-config SYSCALL_DEBUG
-       bool "Enable system call debugging"
+config DEBUG_STACK_USAGE
+       bool "Stack utilization instrumentation"
        default N
-       depends on DEBUG_INFO
        help
-       This adds some system debugging to UML, including keeping a ring buffer
-       with recent system calls and some global and per-task statistics.
-
-       If unsure, say N
+         Track the maximum kernel stack usage - this will look at each
+         kernel stack at process exit and log it if it's the deepest
+         stack seen so far.
 
+         This option will slow down process creation and destruction somewhat.
 endmenu