X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fcris%2FKconfig.debug;h=0a1d62a23614884b82d8af1bef6d06f127fb629c;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=9864aade259226bc6e3ceacbf5da3f97a2137ee6;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/arch/cris/Kconfig.debug b/arch/cris/Kconfig.debug
index 9864aade2..0a1d62a23 100644
--- a/arch/cris/Kconfig.debug
+++ b/arch/cris/Kconfig.debug
@@ -1,18 +1,17 @@
 menu "Kernel hacking"
 
-source "lib/Kconfig.debug"
-
 #bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
-config PROFILE
+config PROFILING
 	bool "Kernel profiling support"
 
-config PROFILE_SHIFT
-	int "Profile shift count"
-	depends on PROFILE
-	default "2"
+config SYSTEM_PROFILER
+	bool "System profiling support"
+
+source "lib/Kconfig.debug"
 
 config ETRAX_KGDB
 	bool "Use kernel GDB debugger"
+	depends on DEBUG_KERNEL
 	---help---
 	  The CRIS version of gdb can be used to remotely debug a running
 	  Linux kernel via the serial debug port.  Provided you have gdb-cris
@@ -25,4 +24,12 @@ config ETRAX_KGDB
 	  didn't before).  The kernel halts when it boots, waiting for gdb if
 	  this option is turned on!
 
+
+config DEBUG_NMI_OOPS
+	bool "NMI causes oops printout"
+	depends on DEBUG_KERNEL
+	help
+	  If the system locks up without any debug information you can say Y
+	  here to make it possible to dump an OOPS with an external NMI.
+
 endmenu