summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2007-05-08 15:39:13 +0700
committerArve Hjønnevåg <arve@android.com>2010-02-03 21:26:57 -0800
commit207f66e23a69bc23265e1f133702bc59c3096696 (patch)
treecc6941903ba5d9426dd9c5a7f7befec2bc5182b1 /kernel
parent3414e45fe081b2f7b89a2156e0b7eec26f77839b (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 96b45d0b4ba5..5fc6031d1958 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -29,7 +29,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);