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
Showing
- arch/mips/ar7/setup.c 0 additions, 1 deletionarch/mips/ar7/setup.c
- arch/mips/emma/markeins/setup.c 0 additions, 3 deletionsarch/mips/emma/markeins/setup.c
- arch/mips/netlogic/xlp/setup.c 0 additions, 1 deletionarch/mips/netlogic/xlp/setup.c
- arch/mips/netlogic/xlr/setup.c 0 additions, 1 deletionarch/mips/netlogic/xlr/setup.c
- arch/mips/sibyte/swarm/setup.c 0 additions, 2 deletionsarch/mips/sibyte/swarm/setup.c
- arch/powerpc/Kconfig 4 additions, 0 deletionsarch/powerpc/Kconfig
- arch/powerpc/include/asm/setup.h 1 addition, 0 deletionsarch/powerpc/include/asm/setup.h
- arch/powerpc/kernel/setup_32.c 0 additions, 3 deletionsarch/powerpc/kernel/setup_32.c
- arch/powerpc/kernel/setup_64.c 0 additions, 3 deletionsarch/powerpc/kernel/setup_64.c
- arch/powerpc/platforms/pseries/setup.c 1 addition, 1 deletionarch/powerpc/platforms/pseries/setup.c
- include/linux/kernel.h 9 additions, 0 deletionsinclude/linux/kernel.h
- kernel/panic.c 1 addition, 1 deletionkernel/panic.c
- lib/Kconfig.debug 9 additions, 0 deletionslib/Kconfig.debug
Please register or sign in to comment