Merge branch 'linus' into timers/core

[pandora-kernel.git] / arch / blackfin / Kconfig.debug

diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug
index 87f195e..aec89a5 100644 (file)
--- a/arch/blackfin/Kconfig.debug
+++ b/arch/blackfin/Kconfig.debug
@@ -18,9 +18,6 @@ config DEBUG_STACK_USAGE
 
          This option will slow down process creation somewhat.
 
 
          This option will slow down process creation somewhat.
 

-config HAVE_ARCH_KGDB
-       def_bool y
-

 config DEBUG_VERBOSE
        bool "Verbose fault messages"
        default y
 config DEBUG_VERBOSE
        bool "Verbose fault messages"
        default y


@@ -238,6 +235,15 @@ config EARLY_PRINTK
          all of this lives in the init section and is thrown away after the
          kernel boots completely.
 
          all of this lives in the init section and is thrown away after the
          kernel boots completely.
 

+config NMI_WATCHDOG
+       bool "Enable NMI watchdog to help debugging lockup on SMP"
+       default n
+       depends on (SMP && !BFIN_SCRATCH_REG_RETN)
+       help
+         If any CPU in the system does not execute the period local timer
+         interrupt for more than 5 seconds, then the NMI handler dumps debug
+         information. This information can be used to debug the lockup.
+

 config CPLB_INFO
        bool "Display the CPLB information"
        help
 config CPLB_INFO
        bool "Display the CPLB information"
        help