summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/smp.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 16:07:27 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 16:07:27 +0200
commit97c24c1aa403e0d4ef7c1958db8459e488862b46 (patch)
tree15214db3c82fffcdbad1d0ef109c9c7558982ebb /arch/arm/include/asm/smp.h
parentf350b86121c7a004a5f866333fa1d23fe30263a6 (diff)
parent4a139b64703115e41e1a4e16ebf7eb93d0a0e349 (diff)
Merge branches 'cross-platform/debug_ll' and 'cross-platform/cpu-mapping' into next/cross-platform
Diffstat (limited to 'arch/arm/include/asm/smp.h')
-rw-r--r--arch/arm/include/asm/smp.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index e42d96a45d3..0a17b62538c 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -33,6 +33,11 @@ extern void show_ipi_list(struct seq_file *, int);
asmlinkage void do_IPI(int ipinr, struct pt_regs *regs);
/*
+ * Called from C code, this handles an IPI.
+ */
+void handle_IPI(int ipinr, struct pt_regs *regs);
+
+/*
* Setup the set of possible CPUs (via set_cpu_possible)
*/
extern void smp_init_cpus(void);
@@ -66,6 +71,12 @@ extern void platform_secondary_init(unsigned int cpu);
extern void platform_smp_prepare_cpus(unsigned int);
/*
+ * Logical CPU mapping.
+ */
+extern int __cpu_logical_map[NR_CPUS];
+#define cpu_logical_map(cpu) __cpu_logical_map[cpu]
+
+/*
* Initial data for bringing up a secondary CPU.
*/
struct secondary_data {