diff options
Diffstat (limited to 'arch/powerpc/kernel/crash.c')
| -rw-r--r-- | arch/powerpc/kernel/crash.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 3d3d416339dd..5b5e1f002a8e 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c | |||
| @@ -163,7 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu) | |||
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | /* wait for all the CPUs to hit real mode but timeout if they don't come in */ | 165 | /* wait for all the CPUs to hit real mode but timeout if they don't come in */ |
| 166 | #if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP) | 166 | #ifdef CONFIG_PPC_STD_MMU_64 |
| 167 | static void crash_kexec_wait_realmode(int cpu) | 167 | static void crash_kexec_wait_realmode(int cpu) |
| 168 | { | 168 | { |
| 169 | unsigned int msecs; | 169 | unsigned int msecs; |
| @@ -188,9 +188,7 @@ static void crash_kexec_wait_realmode(int cpu) | |||
| 188 | } | 188 | } |
| 189 | mb(); | 189 | mb(); |
| 190 | } | 190 | } |
| 191 | #else | 191 | #endif /* CONFIG_PPC_STD_MMU_64 */ |
| 192 | static inline void crash_kexec_wait_realmode(int cpu) {} | ||
| 193 | #endif | ||
| 194 | 192 | ||
| 195 | /* | 193 | /* |
| 196 | * This function will be called by secondary cpus or by kexec cpu | 194 | * This function will be called by secondary cpus or by kexec cpu |
| @@ -235,7 +233,9 @@ void crash_kexec_secondary(struct pt_regs *regs) | |||
| 235 | crash_ipi_callback(regs); | 233 | crash_ipi_callback(regs); |
| 236 | } | 234 | } |
| 237 | 235 | ||
| 238 | #else | 236 | #else /* ! CONFIG_SMP */ |
| 237 | static inline void crash_kexec_wait_realmode(int cpu) {} | ||
| 238 | |||
| 239 | static void crash_kexec_prepare_cpus(int cpu) | 239 | static void crash_kexec_prepare_cpus(int cpu) |
| 240 | { | 240 | { |
| 241 | /* | 241 | /* |
| @@ -255,7 +255,7 @@ void crash_kexec_secondary(struct pt_regs *regs) | |||
| 255 | { | 255 | { |
| 256 | cpus_in_sr = CPU_MASK_NONE; | 256 | cpus_in_sr = CPU_MASK_NONE; |
| 257 | } | 257 | } |
| 258 | #endif | 258 | #endif /* CONFIG_SMP */ |
| 259 | 259 | ||
| 260 | /* | 260 | /* |
| 261 | * Register a function to be called on shutdown. Only use this if you | 261 | * Register a function to be called on shutdown. Only use this if you |
