Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7972e966 authored by Ralf Baechle's avatar Ralf Baechle Committed by Ingo Molnar
Browse files

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: default avatarRalf Baechle <ralf@linux-mips.org>
Acked-by: default avatarShinya Kuribayashi <skuribay@pobox.com>
Signed-off-by: default avatarJason 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: default avatarIngo Molnar <mingo@kernel.org>
parent 5800dc3c

arch/mips/ar7/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

arch/mips/emma/markeins/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ void __init plat_mem_setup(void) 
	iomem_resource.start = EMMA2RH_IO_BASE;

	iomem_resource.end = EMMA2RH_ROM_BASE - 1;



	/* Reboot on panic */

	panic_timeout = 180;



	markeins_sio_setup();

}

arch/mips/netlogic/xlp/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static void __init xlp_init_mem_from_bars(void) 


void __init plat_mem_setup(void)

{

	panic_timeout	= 5;

	_machine_restart = (void (*)(char *))nlm_linux_exit;

	_machine_halt	= nlm_linux_exit;

	pm_power_off	= nlm_linux_exit;

arch/mips/netlogic/xlr/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static void nlm_linux_exit(void) 


void __init plat_mem_setup(void)

{

	panic_timeout	= 5;

	_machine_restart = (void (*)(char *))nlm_linux_exit;

	_machine_halt	= nlm_linux_exit;

	pm_power_off	= nlm_linux_exit;

arch/mips/sibyte/swarm/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ void __init plat_mem_setup(void) 
#error invalid SiByte board configuration

#endif



	panic_timeout = 5;  /* For debug.  */



	board_be_handler = swarm_be_handler;



	if (xicor_probe())