Skip to contentSkip to conversation

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

PATCH In review Shaun Ruffell 2 participants 3 messages Apr 14, 2011 – Apr 15, 2011 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: Define 'crash_kexec_wait_realmode' for Non-SMP systems.

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.

---
 arch/powerpc/kernel/crash.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/powerpc/kernel/crash.c +3 -0
index 3d3d416..5e6e37f 100644
@@ -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
 
 /*
Signature · 1 line
1.7.4.3
#1 lore raw
Quoted 1 line · Shaun Ruffell

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.

Quoted 27 lines

"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.

---
 arch/powerpc/kernel/crash.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/powerpc/kernel/crash.c +3 -0
index 3d3d416..5e6e37f 100644
@@ -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
 
 /*
#2 lore raw
Quoted 9 lines · Paul Gortmaker
Quoted 1 line · Shaun Ruffell

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