From 452704e2649e44720a9cbd33bf491b8c45911203 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 6 Jan 2011 17:54:15 +0000 Subject: [PATCH] --- yaml --- r: 232049 b: refs/heads/master c: 50266a1f8a6618f2e477635cfcf457b5da8d5a68 h: refs/heads/master i: 232047: f4766ef62cdcf7c33d1f217896935dc919923fab v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/machdep.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 077b2aef3b39..398ca666793b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b18ae08deac23187e4a22a8c94a1a473be8e8c93 +refs/heads/master: 50266a1f8a6618f2e477635cfcf457b5da8d5a68 diff --git a/trunk/arch/powerpc/include/asm/machdep.h b/trunk/arch/powerpc/include/asm/machdep.h index 8433d36619a1..b2e8d69280cc 100644 --- a/trunk/arch/powerpc/include/asm/machdep.h +++ b/trunk/arch/powerpc/include/asm/machdep.h @@ -116,9 +116,6 @@ struct machdep_calls { * If for some reason there is no irq, but the interrupt * shouldn't be counted as spurious, return NO_IRQ_IGNORE. */ unsigned int (*get_irq)(void); -#ifdef CONFIG_KEXEC - void (*kexec_cpu_down)(int crash_shutdown, int secondary); -#endif /* PCI stuff */ /* Called after scanning the bus, before allocating resources */ @@ -235,6 +232,8 @@ struct machdep_calls { void (*machine_shutdown)(void); #ifdef CONFIG_KEXEC + void (*kexec_cpu_down)(int crash_shutdown, int secondary); + /* Called to do the minimal shutdown needed to run a kexec'd kernel * to run successfully. * XXX Should we move this one out of kexec scope?