projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a685b2e
)
Add build option to to set the default panic timeout.
author
Arve Hjønnevåg
<arve@android.com>
Tue, 8 May 2007 08:39:13 +0000
(15:39 +0700)
committer
mgross
<mark.gross@intel.com>
Wed, 9 Nov 2011 20:01:13 +0000
(12:01 -0800)
init/Kconfig
patch
|
blob
|
history
kernel/panic.c
patch
|
blob
|
history
diff --git
a/init/Kconfig
b/init/Kconfig
index
412c21b
..
41eccd1
100644
(file)
--- a/
init/Kconfig
+++ b/
init/Kconfig
@@
-915,6
+915,12
@@
config SYSCTL
config ANON_INODES
bool
+config PANIC_TIMEOUT
+ int "Default panic timeout"
+ default 0
+ help
+ Set default panic timeout.
+
menuconfig EXPERT
bool "Configure standard kernel features (expert users)"
help
diff --git
a/kernel/panic.c
b/kernel/panic.c
index
6923167
..
5578d0a
100644
(file)
--- 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);