From d66333c91b0d3ba71548fe0baabcb8135fc649ed Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 25 Sep 2009 15:35:28 +0100
Subject: [PATCH] --- yaml --- r: 166615 b: refs/heads/master c:
 eef34ec514054e4685745236dd5c9658f7aca69e h: refs/heads/master i:   166613:
 fbb3b080b0565fe66c1f299103385af3da06bdd4   166611:
 fd7ebfc791dca48bb49fb12d569c15d61efbb166   166607:
 c8547ff8ac914159ce7ead695836645349442d2c v: v3

---
 [refs]                            |  2 +-
 trunk/arch/mips/include/asm/smp.h | 15 +++++++++++++--
 trunk/arch/mips/kernel/smp.c      | 13 -------------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 9131f6b4b37e..10a6026cdd12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b533e652df3bbb8f0ea63dc22054edf4cd4155df
+refs/heads/master: eef34ec514054e4685745236dd5c9658f7aca69e
diff --git a/trunk/arch/mips/include/asm/smp.h b/trunk/arch/mips/include/asm/smp.h
index e15f11a09311..af42385245d5 100644
--- a/trunk/arch/mips/include/asm/smp.h
+++ b/trunk/arch/mips/include/asm/smp.h
@@ -77,7 +77,18 @@ extern void play_dead(void);
 
 extern asmlinkage void smp_call_function_interrupt(void);
 
-extern void arch_send_call_function_single_ipi(int cpu);
-extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
+static inline void arch_send_call_function_single_ipi(int cpu)
+{
+	extern struct plat_smp_ops *mp_ops;     /* private */
+
+	mp_ops->send_ipi_mask(&cpumask_of_cpu(cpu), SMP_CALL_FUNCTION);
+}
+
+static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)
+{
+	extern struct plat_smp_ops *mp_ops;     /* private */
+
+	mp_ops->send_ipi_mask(mask, SMP_CALL_FUNCTION);
+}
 
 #endif /* __ASM_SMP_H */
diff --git a/trunk/arch/mips/kernel/smp.c b/trunk/arch/mips/kernel/smp.c
index d74b4dd2dfb2..e72e6844d134 100644
--- a/trunk/arch/mips/kernel/smp.c
+++ b/trunk/arch/mips/kernel/smp.c
@@ -127,19 +127,6 @@ asmlinkage __cpuinit void start_secondary(void)
 	cpu_idle();
 }
 
-void arch_send_call_function_ipi_mask(const struct cpumask *mask)
-{
-	mp_ops->send_ipi_mask(mask, SMP_CALL_FUNCTION);
-}
-
-/*
- * We reuse the same vector for the single IPI
- */
-void arch_send_call_function_single_ipi(int cpu)
-{
-	mp_ops->send_ipi_mask(&cpumask_of_cpu(cpu), SMP_CALL_FUNCTION);
-}
-
 /*
  * Call into both interrupt handlers, as we share the IPI for them
  */