path: root/arch/mips/ar7/setup.c
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 /arch/mips/ar7/setup.c
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 'arch/mips/ar7/setup.c')
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
index 9a357fffcfbe..820b7a313d9b 100644
--- a/arch/mips/ar7/setup.c
+++ b/arch/mips/ar7/setup.c
@@ -92,7 +92,6 @@ void __init plat_mem_setup(void)
_machine_restart = ar7_machine_restart;
_machine_halt = ar7_machine_halt;
pm_power_off = ar7_machine_power_off;
- panic_timeout = 3;
io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000);
if (!io_base)