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

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

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 515f9e61130749d2779e09b402e78db66cf07c38..72d5c198e790bdaa5ca9b38f7399f3beb4e147ea 100644 (file)
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -1,5 +1,9 @@
 menu "Kernel hacking"
 
+config TRACE_IRQFLAGS_SUPPORT
+       bool
+       default y
+
 source "lib/Kconfig.debug"
 
 config CROSSCOMPILE
@@ -18,10 +22,10 @@ config CMDLINE
        string "Default kernel command string"
        default ""
        help
-          On some platforms, there is currently no way for the boot loader to
-          pass arguments to the kernel. For these platforms, you can supply
-          some command-line options at build time by entering them here.  In
-          other cases you can specify kernel args so that you don't have
+         On some platforms, there is currently no way for the boot loader to
+         pass arguments to the kernel. For these platforms, you can supply
+         some command-line options at build time by entering them here.  In
+         other cases you can specify kernel args so that you don't have
          to set them up in board prom initialization routines.
 
 config DEBUG_STACK_USAGE
@@ -33,9 +37,18 @@ config DEBUG_STACK_USAGE
 
          This option will slow down process creation somewhat.
 
+config CONFIG_SMTC_IDLE_HOOK_DEBUG
+       bool "Enable additional debug checks before going into CPU idle loop"
+       depends on DEBUG_KERNEL && MIPS_MT_SMTC
+       help
+         This option enables Enable additional debug checks before going into
+         CPU idle loop.  For details on these checks, see
+         arch/mips/kernel/smtc.c.  This debugging option result in significant
+         overhead so should be disabled in production kernels.
+
 config KGDB
        bool "Remote GDB kernel debugging"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && SYS_SUPPORTS_KGDB
        select DEBUG_INFO
        help
          If you say Y here, it will be possible to remotely debug the MIPS
@@ -44,6 +57,9 @@ config KGDB
          better 32 MB RAM to avoid excessive linking time. This is only
          useful for kernel hackers. If unsure, say N.
 
+config SYS_SUPPORTS_KGDB
+       bool
+
 config GDB_CONSOLE
        bool "Console output to GDB"
        depends on KGDB