X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Fpanic.c;h=1daccb2ffa03994e3c91fd765764a0c21032b051;hb=4f948f64ab7180b482b159993c79fabd2d1a7172;hp=167ec097ce8b3851d8f78c2ac7ef2614c840d517;hpb=aca50f226d2a135774ba8681f49d907ab6e48829;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/panic.c b/kernel/panic.c
index 167ec097ce8b..1daccb2ffa03 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);