ARM: smp: Remove use of IPI_CALL_FUNC_SINGLE
Fix for compile issue which introduced in
'commit 741a8ec5bb22 ("ARM64: smp: Prevent cluster LPM
modes when pending IPIs on cluster CPUs")'.
Correct to use IPI_CALL_FUNC instead of deprecated
IPI_CALL_FUNC_SINGLE. And fix for using smp_cross_call
instead of __smp_cross_call to get needed trace.
Change-Id: Ibb1794357e7be9be80edca99822a4f27e7b886dd
Signed-off-by: Maria Yu <aiquny@codeaurora.org>
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index bbf60e3..ab509d6 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -466,17 +466,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
}
static void (*__smp_cross_call)(const struct cpumask *, unsigned int);
-DEFINE_PER_CPU(bool, pending_ipi);
-static void smp_cross_call_common(const struct cpumask *cpumask,
- unsigned int func)
-{
- unsigned int cpu;
-
- for_each_cpu(cpu, cpumask)
- per_cpu(pending_ipi, cpu) = true;
-
- __smp_cross_call(cpumask, func);
-}
void __init set_smp_cross_call(void (*fn)(const struct cpumask *, unsigned int))
{
@@ -501,6 +490,18 @@ static void smp_cross_call(const struct cpumask *target, unsigned int ipinr)
__smp_cross_call(target, ipinr);
}
+DEFINE_PER_CPU(bool, pending_ipi);
+static void smp_cross_call_common(const struct cpumask *cpumask,
+ unsigned int func)
+{
+ unsigned int cpu;
+
+ for_each_cpu(cpu, cpumask)
+ per_cpu(pending_ipi, cpu) = true;
+
+ smp_cross_call(cpumask, func);
+}
+
void show_ipi_list(struct seq_file *p, int prec)
{
unsigned int cpu, i;
@@ -539,7 +540,7 @@ void arch_send_wakeup_ipi_mask(const struct cpumask *mask)
void arch_send_call_function_single_ipi(int cpu)
{
- smp_cross_call_common(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);
+ smp_cross_call_common(cpumask_of(cpu), IPI_CALL_FUNC);
}
#ifdef CONFIG_IRQ_WORK