summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/smp.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-30 12:38:01 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-04-21 12:23:25 +0900
commit3366e3585fbf0d40ce6f2382b544851cf4df1654 (patch)
tree2d0e01291d103d28bdb67afffb816fa1d7023fbb /arch/sh/include/asm/smp.h
parent4a6feab0ee5240c4bd5378d9f8a46b85718c68a7 (diff)
downloadop-kernel-dev-3366e3585fbf0d40ce6f2382b544851cf4df1654.zip
op-kernel-dev-3366e3585fbf0d40ce6f2382b544851cf4df1654.tar.gz
sh: Move platform smp ops in to their own structure.
This cribs the MIPS plat_smp_ops approach for wrapping up the platform ops. This will allow for mixing and matching different ops on the same platform in the future. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/smp.h')
-rw-r--r--arch/sh/include/asm/smp.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h
index 53ef26c..7f13d46 100644
--- a/arch/sh/include/asm/smp.h
+++ b/arch/sh/include/asm/smp.h
@@ -3,6 +3,7 @@
#include <linux/bitops.h>
#include <linux/cpumask.h>
+#include <asm/smp-ops.h>
#ifdef CONFIG_SMP
@@ -11,7 +12,6 @@
#include <asm/current.h>
#define raw_smp_processor_id() (current_thread_info()->cpu)
-#define hard_smp_processor_id() plat_smp_processor_id()
/* Map from cpu id to sequential logical cpu number. */
extern int __cpu_number_map[NR_CPUS];
@@ -36,15 +36,19 @@ void smp_timer_broadcast(const struct cpumask *mask);
void local_timer_interrupt(void);
void local_timer_setup(unsigned int cpu);
-void plat_smp_setup(void);
-void plat_prepare_cpus(unsigned int max_cpus);
-int plat_smp_processor_id(void);
-void plat_start_cpu(unsigned int cpu, unsigned long entry_point);
-void plat_send_ipi(unsigned int cpu, unsigned int message);
-
void arch_send_call_function_single_ipi(int cpu);
extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
+static inline int hard_smp_processor_id(void)
+{
+ extern struct plat_smp_ops *mp_ops; /* private */
+
+ if (!mp_ops)
+ return 0; /* boot CPU */
+
+ return mp_ops->smp_processor_id();
+}
+
#else
#define hard_smp_processor_id() (0)
OpenPOWER on IntegriCloud