|
@@ -351,6 +351,7 @@ struct smp_ops_t smp_85xx_ops = {
|
|
|
};
|
|
|
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
+#ifdef CONFIG_PPC32
|
|
|
atomic_t kexec_down_cpus = ATOMIC_INIT(0);
|
|
|
|
|
|
void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
|
|
@@ -370,9 +371,18 @@ static void mpc85xx_smp_kexec_down(void *arg)
|
|
|
if (ppc_md.kexec_cpu_down)
|
|
|
ppc_md.kexec_cpu_down(0,1);
|
|
|
}
|
|
|
+#else
|
|
|
+void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
|
|
|
+{
|
|
|
+ local_irq_disable();
|
|
|
+ hard_irq_disable();
|
|
|
+ mpic_teardown_this_cpu(secondary);
|
|
|
+}
|
|
|
+#endif
|
|
|
|
|
|
static void mpc85xx_smp_machine_kexec(struct kimage *image)
|
|
|
{
|
|
|
+#ifdef CONFIG_PPC32
|
|
|
int timeout = INT_MAX;
|
|
|
int i, num_cpus = num_present_cpus();
|
|
|
|
|
@@ -393,6 +403,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
|
|
|
if ( i == smp_processor_id() ) continue;
|
|
|
mpic_reset_core(i);
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
default_machine_kexec(image);
|
|
|
}
|