Add build option to to set the default panic timeout.

diff --git a/init/Kconfig b/init/Kconfig
index 2de5b1cbadd9e47138f879d23cc4d2d5066d32d7..8ec94480f41aa9386da5f4648099f928197f81f1 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -790,6 +790,12 @@ config SYSCTL
 config ANON_INODES
        bool
 
+config PANIC_TIMEOUT
+       int "Default panic timeout"
+       default 0
+       help
+         Set default panic timeout.
+
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help

diff --git a/kernel/panic.c b/kernel/panic.c
index 4c13b1a88ebbf0a6044da356926a2be0c92aaff8..c4c6bff9ff639fd0e1136fb0e7f74999d4064635 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -33,7 +33,10 @@ static int pause_on_oops;
 static int pause_on_oops_flag;
 static DEFINE_SPINLOCK(pause_on_oops_lock);
 
-int panic_timeout;
+#ifndef CONFIG_PANIC_TIMEOUT
+#define CONFIG_PANIC_TIMEOUT 0
+#endif
+int panic_timeout = CONFIG_PANIC_TIMEOUT;
 
 ATOMIC_NOTIFIER_HEAD(panic_notifier_list);