From 7a80125d6102747bb4a4d9fc3a70183707f4dec4 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 6 Jan 2011 17:54:58 +0000 Subject: [PATCH] --- yaml --- r: 232050 b: refs/heads/master c: 619b267724e8cc41072d650ae28114851dd8bf56 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/machdep.h | 3 --- trunk/arch/powerpc/kernel/machine_kexec.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 398ca666793b..db11a00587ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50266a1f8a6618f2e477635cfcf457b5da8d5a68 +refs/heads/master: 619b267724e8cc41072d650ae28114851dd8bf56 diff --git a/trunk/arch/powerpc/include/asm/machdep.h b/trunk/arch/powerpc/include/asm/machdep.h index b2e8d69280cc..67cd82e4e27f 100644 --- a/trunk/arch/powerpc/include/asm/machdep.h +++ b/trunk/arch/powerpc/include/asm/machdep.h @@ -247,9 +247,6 @@ struct machdep_calls { */ int (*machine_kexec_prepare)(struct kimage *image); - /* Called to handle any machine specific cleanup on image */ - void (*machine_kexec_cleanup)(struct kimage *image); - /* Called to perform the _real_ kexec. * Do NOT allocate memory or fail here. We are past the point of * no return. diff --git a/trunk/arch/powerpc/kernel/machine_kexec.c b/trunk/arch/powerpc/kernel/machine_kexec.c index df7e20c191cd..fae67642499d 100644 --- a/trunk/arch/powerpc/kernel/machine_kexec.c +++ b/trunk/arch/powerpc/kernel/machine_kexec.c @@ -65,8 +65,6 @@ int machine_kexec_prepare(struct kimage *image) void machine_kexec_cleanup(struct kimage *image) { - if (ppc_md.machine_kexec_cleanup) - ppc_md.machine_kexec_cleanup(image); } void arch_crash_save_vmcoreinfo(void)