Revert "Add build option to to set the default panic timeout."

This reverts commit 207f66e23a69bc23265e1f133702bc59c3096696.

diff --git a/init/Kconfig b/init/Kconfig
index 184a603ad72bf9487e8ed0536aecfabc7b3d3c31..714597c6f8426c85227892c1b1c9eabdd42bf0e1 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -738,12 +738,6 @@ 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 5fc6031d1958431edf8823ced4e9975e420d88e8..96b45d0b4ba50853030c295f5b0dbcf9bf33cc88 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -29,10 +29,7 @@ static int pause_on_oops;
 static int pause_on_oops_flag;
 static DEFINE_SPINLOCK(pause_on_oops_lock);
 
-#ifndef CONFIG_PANIC_TIMEOUT
-#define CONFIG_PANIC_TIMEOUT 0
-#endif
-int panic_timeout = CONFIG_PANIC_TIMEOUT;
+int panic_timeout;
 
 ATOMIC_NOTIFIER_HEAD(panic_notifier_list);