diff options
| -rw-r--r-- | init/Kconfig | 6 | ||||
| -rw-r--r-- | kernel/panic.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index d62778390e55..0b012a718259 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -915,6 +915,12 @@ config SYSCTL config ANON_INODES 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 d7bb6974efb5..cdb86b128328 100644 --- 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; EXPORT_SYMBOL_GPL(panic_timeout); ATOMIC_NOTIFIER_HEAD(panic_notifier_list); |