Merge tag 'powerpc-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-block.git] / arch / powerpc / platforms / 85xx / smp.c

diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 40aa5820688831fd22cbfc2d7c1f4a0632f9fb67..e52b848b64b79a3d6560c2af0aa89301736cd944 100644 (file)
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -398,6 +398,7 @@ static void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
        hard_irq_disable();
        mpic_teardown_this_cpu(secondary);
 
+#ifdef CONFIG_CRASH_DUMP
        if (cpu == crashing_cpu && cpu_thread_in_core(cpu) != 0) {
                /*
                 * We enter the crash kernel on whatever cpu crashed,
@@ -406,9 +407,11 @@ static void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
                 */
                disable_threadbit = 1;
                disable_cpu = cpu_first_thread_sibling(cpu);
-       } else if (sibling != crashing_cpu &&
-                  cpu_thread_in_core(cpu) == 0 &&
-                  cpu_thread_in_core(sibling) != 0) {
+       } else if (sibling == crashing_cpu) {
+               return;
+       }
+#endif
+       if (cpu_thread_in_core(cpu) == 0 && cpu_thread_in_core(sibling) != 0) {
                disable_threadbit = 2;
                disable_cpu = sibling;
        }