diff options
| author | Arve Hjønnevåg <arve@android.com> | 2007-05-08 15:39:13 +0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-07-01 13:34:56 -0700 |
| commit | 4f948f64ab7180b482b159993c79fabd2d1a7172 (patch) | |
| tree | f72a8510d4512172eb496a28d40dbd5feba1c562 | |
| parent | aca50f226d2a135774ba8681f49d907ab6e48829 (diff) | |
Add build option to to set the default panic timeout.
| -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 2d9b83104dcf..d6660c5b4d76 100644 --- 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 167ec097ce8b..1daccb2ffa03 100644 --- 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); |