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>2013-07-01 13:34:56 -0700
commit4f948f64ab7180b482b159993c79fabd2d1a7172 (patch)
treef72a8510d4512172eb496a28d40dbd5feba1c562 /kernel
parentaca50f226d2a135774ba8681f49d907ab6e48829 (diff)
downloadolio-linux-3.10-4f948f64ab7180b482b159993c79fabd2d1a7172.tar.xz
olio-linux-3.10-4f948f64ab7180b482b159993c79fabd2d1a7172.zip
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 167ec097ce8..1daccb2ffa0 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -32,7 +32,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);