aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/smp.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-15 21:07:59 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-15 21:07:59 -0400
commit84c3d4aaec3338201b449034beac41635866bddf (patch)
tree3412951682fb2dd4feb8a5532f8efbaf8b345933 /include/asm-powerpc/smp.h
parent43d2548bb2ef7e6d753f91468a746784041e522d (diff)
parentfafa3a3f16723997f039a0193997464d66dafd8f (diff)
Merge commit 'origin/master'
Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c
Diffstat (limited to 'include/asm-powerpc/smp.h')
-rw-r--r--include/asm-powerpc/smp.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-powerpc/smp.h b/include/asm-powerpc/smp.h
index 1cd43e3d94fb..416d4c288cea 100644
--- a/include/asm-powerpc/smp.h
+++ b/include/asm-powerpc/smp.h
@@ -69,10 +69,7 @@ DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
69 * in /proc/interrupts will be wrong!!! --Troy */ 69 * in /proc/interrupts will be wrong!!! --Troy */
70#define PPC_MSG_CALL_FUNCTION 0 70#define PPC_MSG_CALL_FUNCTION 0
71#define PPC_MSG_RESCHEDULE 1 71#define PPC_MSG_RESCHEDULE 1
72/* This is unused now */ 72#define PPC_MSG_CALL_FUNC_SINGLE 2
73#if 0
74#define PPC_MSG_MIGRATE_TASK 2
75#endif
76#define PPC_MSG_DEBUGGER_BREAK 3 73#define PPC_MSG_DEBUGGER_BREAK 3
77 74
78void smp_init_iSeries(void); 75void smp_init_iSeries(void);
@@ -119,6 +116,9 @@ extern void smp_generic_take_timebase(void);
119 116
120extern struct smp_ops_t *smp_ops; 117extern struct smp_ops_t *smp_ops;
121 118
119extern void arch_send_call_function_single_ipi(int cpu);
120extern void arch_send_call_function_ipi(cpumask_t mask);
121
122#endif /* __ASSEMBLY__ */ 122#endif /* __ASSEMBLY__ */
123 123
124#endif /* __KERNEL__ */ 124#endif /* __KERNEL__ */