powerpc: Change the doorbell IPI calling convention

[mirror_ubuntu-bionic-kernel.git] / arch / powerpc / platforms / 85xx / smp.c

diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 078097a0b09d476a7b4a1a03196ed1a0acac4808..0975066f76e863d022abac12c25889571a819373 100644 (file)
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -461,16 +461,9 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
 }
 #endif /* CONFIG_KEXEC_CORE */
 
-static void smp_85xx_basic_setup(int cpu_nr)
-{
-       if (cpu_has_feature(CPU_FTR_DBELL))
-               doorbell_setup_this_cpu();
-}
-
 static void smp_85xx_setup_cpu(int cpu_nr)
 {
        mpic_setup_this_cpu();
-       smp_85xx_basic_setup(cpu_nr);
 }
 
 void __init mpc85xx_smp_init(void)
@@ -484,7 +477,7 @@ void __init mpc85xx_smp_init(void)
                smp_85xx_ops.setup_cpu = smp_85xx_setup_cpu;
                smp_85xx_ops.message_pass = smp_mpic_message_pass;
        } else
-               smp_85xx_ops.setup_cpu = smp_85xx_basic_setup;
+               smp_85xx_ops.setup_cpu = NULL;
 
        if (cpu_has_feature(CPU_FTR_DBELL)) {
                /*
@@ -492,7 +485,7 @@ void __init mpc85xx_smp_init(void)
                 * smp_muxed_ipi_message_pass
                 */
                smp_85xx_ops.message_pass = NULL;
-               smp_85xx_ops.cause_ipi = doorbell_cause_ipi;
+               smp_85xx_ops.cause_ipi = doorbell_global_ipi;
                smp_85xx_ops.probe = NULL;
        }