Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Remove panic_timeout settings

Now that we have a CONFIG_PANIC_TIMEOUT=x setting, remove the
mips settings. The default is 0, which means don't reboot on
panic.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Shinya Kuribayashi <skuribay@pobox.com>
Signed-off-by: Jason Baron <jbaron@akamai.com>
Cc: benh@kernel.crashing.org
Cc: paulus@samba.org
Cc: mpe@ellerman.id.au
Cc: felipe.contreras@gmail.com
Cc: linux-mips@linux-mips.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/d19dc75fca343ec5d9ada75a1400f57330021976.1385418410.git.jbaron@akamai.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Ralf Baechle and committed by
Ingo Molnar
7972e966 5800dc3c

-8
-1
arch/mips/ar7/setup.c
··· 92 92 _machine_restart = ar7_machine_restart; 93 93 _machine_halt = ar7_machine_halt; 94 94 pm_power_off = ar7_machine_power_off; 95 - panic_timeout = 3; 96 95 97 96 io_base = (unsigned long)ioremap(AR7_REGS_BASE, 0x10000); 98 97 if (!io_base)
-3
arch/mips/emma/markeins/setup.c
··· 111 111 iomem_resource.start = EMMA2RH_IO_BASE; 112 112 iomem_resource.end = EMMA2RH_ROM_BASE - 1; 113 113 114 - /* Reboot on panic */ 115 - panic_timeout = 180; 116 - 117 114 markeins_sio_setup(); 118 115 } 119 116
-1
arch/mips/netlogic/xlp/setup.c
··· 92 92 93 93 void __init plat_mem_setup(void) 94 94 { 95 - panic_timeout = 5; 96 95 _machine_restart = (void (*)(char *))nlm_linux_exit; 97 96 _machine_halt = nlm_linux_exit; 98 97 pm_power_off = nlm_linux_exit;
-1
arch/mips/netlogic/xlr/setup.c
··· 92 92 93 93 void __init plat_mem_setup(void) 94 94 { 95 - panic_timeout = 5; 96 95 _machine_restart = (void (*)(char *))nlm_linux_exit; 97 96 _machine_halt = nlm_linux_exit; 98 97 pm_power_off = nlm_linux_exit;
-2
arch/mips/sibyte/swarm/setup.c
··· 134 134 #error invalid SiByte board configuration 135 135 #endif 136 136 137 - panic_timeout = 5; /* For debug. */ 138 - 139 137 board_be_handler = swarm_be_handler; 140 138 141 139 if (xicor_probe())