diff options
| author | Arve Hjønnevåg <arve@android.com> | 2007-05-08 15:39:13 +0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:08:39 -0700 |
| commit | ac7df7d13e258e059dd75341043913498302dcb8 (patch) | |
| tree | c1644e71b604084d13afa8ad36eef7e7eb7b73b9 | |
| parent | 2d35c8339d425a2f0a8201a35adb0fd1210bf822 (diff) | |
| download | kernel_samsung_aries-ac7df7d13e258e059dd75341043913498302dcb8.zip kernel_samsung_aries-ac7df7d13e258e059dd75341043913498302dcb8.tar.gz kernel_samsung_aries-ac7df7d13e258e059dd75341043913498302dcb8.tar.bz2 | |
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 ebafac4..2c6453d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -907,6 +907,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)" help diff --git a/kernel/panic.c b/kernel/panic.c index 6923167..5578d0a 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); |