diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 13:29:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 13:29:05 +1100 |
| commit | c8d71d9bf5eb5c08305bae87cd9e120906aa0d80 (patch) | |
| tree | 0e8a3bd987b3a341a18ef9beac29ad6c76d2dcf3 /include | |
| parent | 868c5874c1f7946e611c14e88bf467f254ef7e79 (diff) | |
| parent | 4145ddda112a16b870e6bc5461625afd28d9df1f (diff) | |
Merge commit 'cpus4096/auto-cpus4096-next'
Conflicts:
include/asm-x86/smp.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/smp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index a6afc29f2dd9..76b9ffb8c14a 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -60,7 +60,7 @@ struct smp_ops { void (*cpu_die)(unsigned int cpu); void (*play_dead)(void); - void (*send_call_func_ipi)(cpumask_t mask); + void (*send_call_func_ipi)(const cpumask_t *mask); void (*send_call_func_single_ipi)(int cpu); }; @@ -125,7 +125,7 @@ static inline void arch_send_call_function_single_ipi(int cpu) static inline void arch_send_call_function_ipi(cpumask_t mask) { - smp_ops.send_call_func_ipi(mask); + smp_ops.send_call_func_ipi(&mask); } void cpu_disable_common(void); @@ -138,7 +138,7 @@ void native_cpu_die(unsigned int cpu); void native_play_dead(void); void play_dead_common(void); -void native_send_call_func_ipi(cpumask_t mask); +void native_send_call_func_ipi(const cpumask_t *mask); void native_send_call_func_single_ipi(int cpu); extern void prefill_possible_map(void); |