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

Commit aa98c50d authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Make kexec_setup() a regular initcall 



There's no reason kexec_setup() needs to be called explicitly from
setup_system(), it can just be a regular initcall.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c30a4df3

arch/powerpc/kernel/machine_kexec_64.c

+3 −1
Original line number Diff line number Diff line
@@ -378,11 +378,13 @@ static void __init export_crashk_values(void) 
	of_node_put(node);

}



void __init kexec_setup(void)

static int __init kexec_setup(void)

{

	export_htab_values();

	export_crashk_values();

	return 0;

}

__initcall(kexec_setup);



static int __init early_parse_crashk(char *p)

{

arch/powerpc/kernel/setup_64.c

+0 −4
Original line number Diff line number Diff line
@@ -350,10 +350,6 @@ void __init setup_system(void) 
	 */

	unflatten_device_tree();



#ifdef CONFIG_KEXEC

	kexec_setup();	/* requires unflattened device tree. */

#endif



	/*

	 * Fill the ppc64_caches & systemcfg structures with informations

	 * retrieved from the device-tree. Need to be called before

include/asm-powerpc/kexec.h

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
#ifdef __powerpc64__

extern void kexec_smp_wait(void);	/* get and clear naca physid, wait for

					  master to copy new code to 0 */

extern void __init kexec_setup(void);

extern int crashing_cpu;

extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *));

#endif /* __powerpc64 __ */