path: root/include/linux/kernel.h
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 10:22:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 10:22:12 -0800
commit897aea303fec0c24b2a21b8e29f45dc73a234555 (patch)
tree511f235fa422163b7a1c8bc58b4d65bd245ec5c8 /include/linux/kernel.h
parent9451ee2d17e6b4bfbc5871f3c86ea744581b0413 (diff)
parentb71d47c14fba6270c0b5a0d56639bf042017025b (diff)
Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core debug changes from Ingo Molnar: "Currently there are two methods to set the panic_timeout: via 'panic=X' boot commandline option, or via /proc/sys/kernel/panic. This tree adds a third panic_timeout configuration method: configuration via Kconfig, via CONFIG_PANIC_TIMEOUT=X - useful to distros that generally want their kernel defaults to come with the .config. CONFIG_PANIC_TIMEOUT defaults to 0, which was the previous default value of panic_timeout. Doing that unearthed a few arch trickeries regarding arch-special panic_timeout values and related complications - hopefully all resolved to the satisfaction of everyone" * 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: powerpc: Clean up panic_timeout usage MIPS: Remove panic_timeout settings panic: Make panic_timeout configurable
Diffstat (limited to 'include/linux/kernel.h')
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index ecb87544cc5d..2aa3d4b000e6 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -394,6 +394,15 @@ extern int panic_on_oops;
extern int panic_on_unrecovered_nmi;
extern int panic_on_io_nmi;
extern int sysctl_panic_on_stackoverflow;
+ * Only to be used by arch init code. If the user over-wrote the default
+ */
+static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout)
+ if (panic_timeout == arch_default_timeout)
+ panic_timeout = timeout;
extern const char *print_tainted(void);
enum lockdep_ok {