Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[~andy/linux] / arch / cris / Kconfig.debug

diff --git a/arch/cris/Kconfig.debug b/arch/cris/Kconfig.debug
index 0a1d62a23614884b82d8af1bef6d06f127fb629c..0b9a630dc812c1106522e5ce59e38c03201a8dcb 100644 (file)
--- a/arch/cris/Kconfig.debug
+++ b/arch/cris/Kconfig.debug
@@ -32,4 +32,10 @@ config DEBUG_NMI_OOPS
          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.
 
+config NO_SEGFAULT_TERMINATION
+       bool "Keep segfaulting processes"
+       help
+         Place segfaulting user mode processes on a wait queue instead of
+         delivering a terminating SIGSEGV to allow debugging with gdb.
+
 endmenu