Add build option to to set the default panic timeout.

diff --git a/init/Kconfig b/init/Kconfig
index eb4b33725db114984f4a967119a59e9892b225c3..13ba324f1981bb7be76c6bd0da57af2ddfa708c0 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -737,6 +737,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 96b45d0b4ba50853030c295f5b0dbcf9bf33cc88..5fc6031d1958431edf8823ced4e9975e420d88e8 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -29,7 +29,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);