summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2007-05-08 15:39:13 +0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:37:51 -0800
commite10525beeb7f0f0baf70efd36063de728b35e603 (patch)
treec5b230e6877ceb72dc7129acc020c13fa45428f7 /kernel
parent9ad1a56ccd21f5ce51c8fcdc52f274b1beaccb9a (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 d7bb6974efb5..cdb86b128328 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);