diff options
| author | Arve Hjønnevåg <arve@android.com> | 2007-05-08 15:39:13 +0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:05 -0700 |
| commit | 37eb616c13e56c74bc389ca5b5fa415db2c8c00b (patch) | |
| tree | eb56127d1cb7d53ae0e942899f94a93267984e00 | |
| parent | a1643c545a5d8ba61ce3a1ea316a1704ca3b71a3 (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 2de5b1cbadd9..8ec94480f41a 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -790,6 +790,12 @@ 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 4c13b1a88ebb..c4c6bff9ff63 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; ATOMIC_NOTIFIER_HEAD(panic_notifier_list); |