diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 22:18:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 22:18:55 -0700 |
| commit | 6e1b97d899401035dd9d02b0fd93ad54641f867a (patch) | |
| tree | f98006592293d38b25a30ab08c3ae88601ac76c1 /include | |
| parent | 36ea96a485ce09a88819896e48468d6469c292ab (diff) | |
| parent | 69243f91257083795065762ce805120b980e256b (diff) | |
| download | kernel_samsung_espresso10-6e1b97d899401035dd9d02b0fd93ad54641f867a.zip kernel_samsung_espresso10-6e1b97d899401035dd9d02b0fd93ad54641f867a.tar.gz kernel_samsung_espresso10-6e1b97d899401035dd9d02b0fd93ad54641f867a.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: Dump filtering supports x86_64 sparsemem
x86: fix compiler warnings in arch/x86/kernel/early-quirks.c
x86: fix !SMP compiler warning in arch/x86/kernel/acpi/processor.c
x86: Fix boot protocol KEEP_SEGMENTS check.
x86: voyager: fix bogus conversion to per_cpu for boot_cpu_info
x86: export smp_ops to allow modular build of KVM
Revert "i386: export i386 smp_call_function_mask() to modules"
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/smp_32.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h index 7056d86..e10b7af 100644 --- a/include/asm-x86/smp_32.h +++ b/include/asm-x86/smp_32.h @@ -94,9 +94,12 @@ static inline void smp_send_reschedule(int cpu) { smp_ops.smp_send_reschedule(cpu); } -extern int smp_call_function_mask(cpumask_t mask, - void (*func) (void *info), void *info, - int wait); +static inline int smp_call_function_mask(cpumask_t mask, + void (*func) (void *info), void *info, + int wait) +{ + return smp_ops.smp_call_function_mask(mask, func, info, wait); +} void native_smp_prepare_boot_cpu(void); void native_smp_prepare_cpus(unsigned int max_cpus); |