diff options
author | Anton Blanchard <anton@samba.org> | 2011-01-06 12:56:09 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-20 22:08:35 -0500 |
commit | c1f784e553490a2602567666fc79ff142cb4413b (patch) | |
tree | ab66c2dfbd209b3d3ca51e1d8be5c3566faaa607 /arch/powerpc | |
parent | c94868788cf26d5ad816646dd9af3cdf6fbd92fd (diff) |
powerpc/kdump: Remove ppc_md.machine_crash_shutdown
No one uses ppc_md.machine_crash_shutdown, so remove it.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/include/asm/machdep.h | 6 | ||||
-rw-r--r-- | arch/powerpc/kernel/machine_kexec.c | 5 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/qpace_setup.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/kexec.c | 1 |
4 files changed, 1 insertions, 12 deletions
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h index cb8139617442..991d5998d6be 100644 --- a/arch/powerpc/include/asm/machdep.h +++ b/arch/powerpc/include/asm/machdep.h | |||
@@ -234,12 +234,6 @@ struct machdep_calls { | |||
234 | #ifdef CONFIG_KEXEC | 234 | #ifdef CONFIG_KEXEC |
235 | void (*kexec_cpu_down)(int crash_shutdown, int secondary); | 235 | void (*kexec_cpu_down)(int crash_shutdown, int secondary); |
236 | 236 | ||
237 | /* Called to do the minimal shutdown needed to run a kexec'd kernel | ||
238 | * to run successfully. | ||
239 | * XXX Should we move this one out of kexec scope? | ||
240 | */ | ||
241 | void (*machine_crash_shutdown)(struct pt_regs *regs); | ||
242 | |||
243 | /* Called to do what every setup is needed on image and the | 237 | /* Called to do what every setup is needed on image and the |
244 | * reboot code buffer. Returns 0 on success. | 238 | * reboot code buffer. Returns 0 on success. |
245 | * Provide your own (maybe dummy) implementation if your platform | 239 | * Provide your own (maybe dummy) implementation if your platform |
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index 43836aa8348e..3427b2faa19a 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c | |||
@@ -44,10 +44,7 @@ void machine_kexec_mask_interrupts(void) { | |||
44 | 44 | ||
45 | void machine_crash_shutdown(struct pt_regs *regs) | 45 | void machine_crash_shutdown(struct pt_regs *regs) |
46 | { | 46 | { |
47 | if (ppc_md.machine_crash_shutdown) | 47 | default_machine_crash_shutdown(regs); |
48 | ppc_md.machine_crash_shutdown(regs); | ||
49 | else | ||
50 | default_machine_crash_shutdown(regs); | ||
51 | } | 48 | } |
52 | 49 | ||
53 | /* | 50 | /* |
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c index 1b5749042756..7970eec4c3a2 100644 --- a/arch/powerpc/platforms/cell/qpace_setup.c +++ b/arch/powerpc/platforms/cell/qpace_setup.c | |||
@@ -148,6 +148,5 @@ define_machine(qpace) { | |||
148 | #ifdef CONFIG_KEXEC | 148 | #ifdef CONFIG_KEXEC |
149 | .machine_kexec = default_machine_kexec, | 149 | .machine_kexec = default_machine_kexec, |
150 | .machine_kexec_prepare = default_machine_kexec_prepare, | 150 | .machine_kexec_prepare = default_machine_kexec_prepare, |
151 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
152 | #endif | 151 | #endif |
153 | }; | 152 | }; |
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c index 53cbd53d8740..3d6279267221 100644 --- a/arch/powerpc/platforms/pseries/kexec.c +++ b/arch/powerpc/platforms/pseries/kexec.c | |||
@@ -66,7 +66,6 @@ static int __init pseries_kexec_setup(void) | |||
66 | { | 66 | { |
67 | ppc_md.machine_kexec = default_machine_kexec; | 67 | ppc_md.machine_kexec = default_machine_kexec; |
68 | ppc_md.machine_kexec_prepare = default_machine_kexec_prepare; | 68 | ppc_md.machine_kexec_prepare = default_machine_kexec_prepare; |
69 | ppc_md.machine_crash_shutdown = default_machine_crash_shutdown; | ||
70 | 69 | ||
71 | return 0; | 70 | return 0; |
72 | } | 71 | } |