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>2009-04-07 16:42:55 -0700
commit539f6c334f7d44d8689200ad74dbc230086a8d87 (patch)
tree5b22cca6b50181766b7a51f650c7182b54f339cc /kernel
parenta4eb204a8029320c2dd748daf4f51fd48d337c3d (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 2a2ff36ff44d..28fb97b8f814 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);