ppc: fix default_machine_crash_shutdown #ifdef botch

RFC PATCH In review Paul E. McKenney 2 participants 3 messages Jun 16, 2010 – Jun 17, 2010 PowerPC

Share & tools

Paul E. McKenney

author

2010-06-16 00:48 UTC #0 lore raw

RFC PATCH 1/1 ppc: fix default_machine_crash_shutdown #ifdef botch

crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64 and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP. Fix the conditional compilation around the invocation.

Untested, probably does not compile.

Signed-off-by Paul E. McKenney <[email protected]>

---

arch/powerpc/kernel/crash.c +1 -1

index b46f2e0..29df48f 100644
@@ -447,7 +447,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
 	crash_kexec_prepare_cpus(crashing_cpu);
 	cpu_set(crashing_cpu, cpus_in_crash);
 	crash_kexec_stop_spus();
-#ifdef CONFIG_PPC_STD_MMU_64
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
 	crash_kexec_wait_realmode(crashing_cpu);
 #endif
 	if (ppc_md.kexec_cpu_down)

Michael Neuling

Acked-by on v1 1/1

2010-06-17 01:56 UTC #1 lore raw

Quoted 7 lines · In message <[email protected]> you wrote:

crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64 and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP. Fix the conditional compilation around the invocation.
Untested, probably does not compile.
Signed-off-by Paul E. McKenney <[email protected]>

This should be right since we don't need to wait for the other CPUs if there are no others...

Compiles for me and even fixes the SMP=N case. Thanks!

Acked-by Michael Neuling <[email protected]>

Quoted 20 lines

---

arch/powerpc/kernel/crash.c +1 -1

index b46f2e0..29df48f 100644
@@ -447,7 +447,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
 	crash_kexec_prepare_cpus(crashing_cpu);
 	cpu_set(crashing_cpu, cpus_in_crash);
 	crash_kexec_stop_spus();
-#ifdef CONFIG_PPC_STD_MMU_64
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
 	crash_kexec_wait_realmode(crashing_cpu);
 #endif
 	if (ppc_md.kexec_cpu_down)

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev

Paul E. McKenney

author

2010-06-17 04:30 UTC #2 lore raw

Quoted 7 lines · Michael Neuling

Quoted 4 lines · In message <[email protected]> you wrote:
crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64 and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP. Fix the conditional compilation around the invocation.

Quoted 8 lines

Quoted 3 lines
Untested, probably does not compile.
Signed-off-by Paul E. McKenney <[email protected]>
This should be right since we don't need to wait for the other CPUs if there are no others...
Compiles for me and even fixes the SMP=N case. Thanks!

Glad it worked! ;-)

Thanx, Paul

Quoted 22 lines

Acked-by Michael Neuling <[email protected]>
Quoted 20 lines
---
arch/powerpc/kernel/crash.c +1 -1
index b46f2e0..29df48f 100644
@@ -447,7 +447,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
 	crash_kexec_prepare_cpus(crashing_cpu);
 	cpu_set(crashing_cpu, cpus_in_crash);
 	crash_kexec_stop_spus();
-#ifdef CONFIG_PPC_STD_MMU_64
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
 	crash_kexec_wait_realmode(crashing_cpu);
 #endif
 	if (ppc_md.kexec_cpu_down)
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev