diff options
| author | Linus Torvalds | 2014-01-20 19:22:12 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-01-20 19:22:12 +0100 |
| commit | 897aea303fec0c24b2a21b8e29f45dc73a234555 (patch) | |
| tree | 511f235fa422163b7a1c8bc58b4d65bd245ec5c8 /arch/metag/include/asm | |
| parent | Merge tag 'ktest-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rost... (diff) | |
| parent | powerpc: Clean up panic_timeout usage (diff) | |
| download | kernel-qcow2-linux-897aea303fec0c24b2a21b8e29f45dc73a234555.tar.gz kernel-qcow2-linux-897aea303fec0c24b2a21b8e29f45dc73a234555.tar.xz kernel-qcow2-linux-897aea303fec0c24b2a21b8e29f45dc73a234555.zip | |
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 'arch/metag/include/asm')
0 files changed, 0 insertions, 0 deletions