summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2007-05-08 15:39:13 +0700
committerBrian Swetland <swetland@google.com>2011-03-29 13:57:02 -0700
commitc34aa7202ad7f45a7bd7b9ccf01e5564ef839b0b (patch)
tree1760d6cb2304033395352219f0e0b68a20ea7190 /kernel
parentde65a0aa4428eae9b1c5dd5cf7250d0448b3f6a2 (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 991bb87a1704..e510d28b3e63 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);