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

Commit f7b9ebb7 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc: Re-order setup_panic() 



Do it right after probe_machine() since it's about testing ppc_md,
and put the test in the common code.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e39afba3

arch/powerpc/kernel/setup-common.c

+2 −0
Original line number Diff line number Diff line
@@ -688,6 +688,8 @@ static struct notifier_block ppc_panic_block = { 


void __init setup_panic(void)

{

	if (!ppc_md.panic)

		return;

	atomic_notifier_chain_register(&panic_notifier_list, &ppc_panic_block);

}

arch/powerpc/kernel/setup_32.c

+2 −3
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ void __init setup_arch(char **cmdline_p) 


	probe_machine();



	setup_panic();



	setup_power_save();



	find_legacy_serial_ports();
@@ -288,9 +290,6 @@ void __init setup_arch(char **cmdline_p) 


	xmon_setup();



	if (ppc_md.panic)

		setup_panic();



	init_mm.start_code = (unsigned long)_stext;

	init_mm.end_code = (unsigned long) _etext;

	init_mm.end_data = (unsigned long) _edata;

arch/powerpc/kernel/setup_64.c

+2 −3
Original line number Diff line number Diff line
@@ -649,6 +649,8 @@ void __init setup_arch(char **cmdline_p) 
	/* Probe the machine type */

	probe_machine();



	setup_panic();



	/*

	 * We can discover serial ports now since the above did setup the

	 * hash table management for us, thus ioremap works. We do that early
@@ -696,9 +698,6 @@ void __init setup_arch(char **cmdline_p) 
	 */

	reserve_hugetlb_gpages();



	if (ppc_md.panic)

		setup_panic();



	klp_init_thread_info(&init_thread_info);



	init_mm.start_code = (unsigned long)_stext;