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

Commit 897aea30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9451ee2d b71d47c1

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())