Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-18 19:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc/kexec: Restore ppc_md.machine_kexec

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

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard 2011-02-23 12:46:16 +00:00 committed by Benjamin Herrenschmidt
parent f342552b91
commit 357574c482
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/include/asm/machdep.h
View File

@ -240,6 +240,12 @@ struct machdep_calls {
* claims to support kexec. * claims to support kexec.
*/ */
int (*machine_kexec_prepare)(struct kimage *image); 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 */ #endif /* CONFIG_KEXEC */
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND

3
arch/powerpc/kernel/machine_kexec.c
View File

@ -87,6 +87,9 @@ void machine_kexec(struct kimage *image)
save_ftrace_enabled = __ftrace_enabled_save(); save_ftrace_enabled = __ftrace_enabled_save();
if (ppc_md.machine_kexec)
ppc_md.machine_kexec(image);
else
default_machine_kexec(image); default_machine_kexec(image);
__ftrace_enabled_restore(save_ftrace_enabled); __ftrace_enabled_restore(save_ftrace_enabled);