diff options
| author | Arve Hjønnevåg <arve@android.com> | 2007-05-08 15:39:13 +0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-02-14 11:25:25 -0800 |
| commit | f7d2d451f673ed320357d34669380391cda0d02f (patch) | |
| tree | 5892351efd34b8b71dff55a98c1448a8972d763b | |
| parent | ec89ae92433d743442287a8b88ff58993388387d (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 3f42cd66f0f8..34f07be2f9da 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -962,6 +962,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 80aed44e345a..d2cbccb207c1 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); |