From: Anton Blanchard <anton@samba.org>
To: benh@kernel.crashing.org
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH 3/8] powerpc/kexec: Remove ppc_md.machine_kexec
Date: Fri, 7 Jan 2011 14:55:36 +1100 [thread overview]
Message-ID: <20110107145536.77a9b0c5@kryten> (raw)
In-Reply-To: <20110107145255.72cf30ba@kryten>
No one uses ppc_md.machine_kexec, so remove it.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: powerpc.git/arch/powerpc/include/asm/machdep.h
===================================================================
--- powerpc.git.orig/arch/powerpc/include/asm/machdep.h 2011-01-07 12:51:51.352308248 +1100
+++ powerpc.git/arch/powerpc/include/asm/machdep.h 2011-01-07 12:51:54.082394288 +1100
@@ -248,12 +248,6 @@ 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
Index: powerpc.git/arch/powerpc/kernel/machine_kexec.c
===================================================================
--- powerpc.git.orig/arch/powerpc/kernel/machine_kexec.c 2011-01-07 12:51:51.352308248 +1100
+++ powerpc.git/arch/powerpc/kernel/machine_kexec.c 2011-01-07 12:51:54.082394288 +1100
@@ -85,10 +85,7 @@ void arch_crash_save_vmcoreinfo(void)
*/
void machine_kexec(struct kimage *image)
{
- if (ppc_md.machine_kexec)
- ppc_md.machine_kexec(image);
- else
- default_machine_kexec(image);
+ default_machine_kexec(image);
/* Fall back to normal restart if we're still alive. */
machine_restart(NULL);
next prev parent reply other threads:[~2011-01-07 3:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 3:52 [PATCH 0/8]: Some kexec/kdump cleanups Anton Blanchard
2011-01-07 3:54 ` [PATCH 1/8] powerpc: Move all ppc_md kexec function pointers together Anton Blanchard
2011-01-07 3:54 ` [PATCH 2/8] powerpc/kexec: Remove ppc_md.machine_kexec_cleanup Anton Blanchard
2011-01-07 3:55 ` Anton Blanchard [this message]
2011-01-07 3:56 ` [PATCH 4/8] powerpc/kdump: Remove ppc_md.machine_crash_shutdown Anton Blanchard
2011-01-07 3:57 ` [PATCH 5/8] powerpc/kexec: Don't initialise kexec hooks to default handlers Anton Blanchard
2011-01-07 3:58 ` [PATCH 6/8] powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare Anton Blanchard
2011-01-07 3:59 ` [PATCH 7/8] powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler Anton Blanchard
2011-01-21 2:43 ` Anton Blanchard
2011-01-07 4:00 ` [PATCH 8/8] powerpc/kdump: Disable ftrace during kexec Anton Blanchard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110107145536.77a9b0c5@kryten \
--to=anton@samba.org \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.