MIPS: Remove panic_timeout settings

ralfbaechle · Ingo Molnar · commit 7972e966b032 · 2013-11-26T12:12:27.000+01:00
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>
diff --git 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)
diff --git a/arch/mips/emma/markeins/setup.c b/arch/mips/emma/markeins/setup.c
@@ -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();
 }
 
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
@@ -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;
diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
@@ -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;
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
@@ -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())

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,6 @@ void __init plat_mem_setup(void)`
`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`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ static void __init xlp_init_mem_from_bars(void)`
`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;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ static void nlm_linux_exit(void)`
`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;`