Add build option to to set the default panic timeout.

diff --git a/init/Kconfig b/init/Kconfig
index 2d9b83104dcf715197f1a84d34b892783ff79fe2..d6660c5b4d7637fbc0fe8f975fed9230f668074a 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1251,6 +1251,12 @@ config HOTPLUG
 config HAVE_PCSPKR_PLATFORM
        bool
 
+config PANIC_TIMEOUT
+       int "Default panic timeout"
+       default 0
+       help
+         Set default panic timeout.
+
 menuconfig EXPERT
        bool "Configure standard kernel features (expert users)"
        # Unhide debug options, to make the on-by-default options visible

diff --git a/kernel/panic.c b/kernel/panic.c
index 167ec097ce8b3851d8f78c2ac7ef2614c840d517..1daccb2ffa03994e3c91fd765764a0c21032b051 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -32,7 +32,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;
 EXPORT_SYMBOL_GPL(panic_timeout);
 
 ATOMIC_NOTIFIER_HEAD(panic_notifier_list);