summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2007-05-08 15:39:13 +0700
committerColin Cross <ccross@android.com>2011-06-14 09:08:39 -0700
commitac7df7d13e258e059dd75341043913498302dcb8 (patch)
treec1644e71b604084d13afa8ad36eef7e7eb7b73b9 /kernel
parent2d35c8339d425a2f0a8201a35adb0fd1210bf822 (diff)
Add build option to to set the default panic timeout.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 69231670eb9..5578d0adc27 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);