Patchwork powerpc: Define 'crash_kexec_wait_realmode' for Non-SMP systems.

login
register
mail settings
Submitter Shaun Ruffell
Date April 14, 2011, 10:27 p.m.
Message ID <20110414222719.GA16256@digium.com>
Download mbox | patch
Permalink /patch/91311/
State Rejected
Headers show

Comments

Shaun Ruffell - April 14, 2011, 10:27 p.m.
This fixes a regression from b987812b3fcaf70fdf0037589e5d2f5f2453e6ce
"powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP" which resulted in

arch/powerpc/kernel/crash.c: In function ‘default_machine_crash_shutdown’:
  arch/powerpc/kernel/crash.c:349: error: implicit declaration of function
  ‘crash_kexec_wait_realmode’

message on when compiling on Blue&White G3 and CONFIG_SMP is not defined.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
---
 arch/powerpc/kernel/crash.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Paul Gortmaker - April 14, 2011, 11:59 p.m.
On 11-04-14 06:27 PM, Shaun Ruffell wrote:
> This fixes a regression from b987812b3fcaf70fdf0037589e5d2f5f2453e6ce

A fix was already sent yesterday:

http://lists.ozlabs.org/pipermail/linuxppc-dev/2011-April/089559.html

which relocates the stub function to where it needs to be.  Your fix
below would end up making duplicate stub functions.

Thanks,
Paul.

> "powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP" which resulted in
> 
> arch/powerpc/kernel/crash.c: In function ‘default_machine_crash_shutdown’:
>   arch/powerpc/kernel/crash.c:349: error: implicit declaration of function
>   ‘crash_kexec_wait_realmode’
> 
> message on when compiling on Blue&White G3 and CONFIG_SMP is not defined.
> 
> Signed-off-by: Shaun Ruffell <sruffell@digium.com>
> ---
>  arch/powerpc/kernel/crash.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
> index 3d3d416..5e6e37f 100644
> --- a/arch/powerpc/kernel/crash.c
> +++ b/arch/powerpc/kernel/crash.c
> @@ -255,6 +255,9 @@ void crash_kexec_secondary(struct pt_regs *regs)
>  {
>  	cpus_in_sr = CPU_MASK_NONE;
>  }
> +
> +static inline void crash_kexec_wait_realmode(int cpu) {}
> +
>  #endif
>  
>  /*
Shaun Ruffell - April 15, 2011, 3:45 a.m.
On 4/14/11 6:59 PM, Paul Gortmaker wrote:
> On 11-04-14 06:27 PM, Shaun Ruffell wrote:
>> This fixes a regression from b987812b3fcaf70fdf0037589e5d2f5f2453e6ce
>
> A fix was already sent yesterday:
>
> http://lists.ozlabs.org/pipermail/linuxppc-dev/2011-April/089559.html
>
> which relocates the stub function to where it needs to be.  Your fix
> below would end up making duplicate stub functions.

Thanks for the reply. I didn't search the linuxppp-dev list before 
sending in that patch, only the LKML. Sorry about the noise.

Cheers,
Shaun

Patch

diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 3d3d416..5e6e37f 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -255,6 +255,9 @@  void crash_kexec_secondary(struct pt_regs *regs)
 {
 	cpus_in_sr = CPU_MASK_NONE;
 }
+
+static inline void crash_kexec_wait_realmode(int cpu) {}
+
 #endif
 
 /*