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

Commit 357574c4 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc/kexec: Restore ppc_md.machine_kexec 



Kyle Moffett points out that mpc85xx has started using the
ppc_md.machine_kexec hook. As such, revert patch c9486878
(powerpc/kexec: Remove ppc_md.machine_kexec).

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent f342552b

arch/powerpc/include/asm/machdep.h

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ struct machdep_calls { 
	 * claims to support kexec.

	 */

	int (*machine_kexec_prepare)(struct kimage *image);



	/* Called to perform the _real_ kexec.

	 * Do NOT allocate memory or fail here. We are past the point of

	 * no return.

	 */

	void (*machine_kexec)(struct kimage *image);

#endif /* CONFIG_KEXEC */



#ifdef CONFIG_SUSPEND

arch/powerpc/kernel/machine_kexec.c

+4 −1
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ void machine_kexec(struct kimage *image) 


	save_ftrace_enabled = __ftrace_enabled_save();



	if (ppc_md.machine_kexec)

		ppc_md.machine_kexec(image);

	else

		default_machine_kexec(image);



	__ftrace_enabled_restore(save_ftrace_enabled);