diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-07-09 17:11:49 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-07-16 12:05:50 +0300 |
| commit | de489353918139161eee241a6224d67f22bfd024 (patch) | |
| tree | 00e1903229a6ebe29736fc86ea30e2f6155d93bf /arch | |
| parent | 4055551bbcb0d0be8c916134b4e9074826e89638 (diff) | |
| download | op-kernel-dev-de489353918139161eee241a6224d67f22bfd024.zip op-kernel-dev-de489353918139161eee241a6224d67f22bfd024.tar.gz | |
i386: Allow smp_call_function_single() to current cpu
This removes the requirement for callers to get_cpu() to check in simple
cases.
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/smpcommon.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/i386/kernel/smpcommon.c b/arch/i386/kernel/smpcommon.c index 1868ae1..bbfe85a 100644 --- a/arch/i386/kernel/smpcommon.c +++ b/arch/i386/kernel/smpcommon.c @@ -47,7 +47,7 @@ int smp_call_function(void (*func) (void *info), void *info, int nonatomic, EXPORT_SYMBOL(smp_call_function); /** - * smp_call_function_single - Run a function on another CPU + * smp_call_function_single - Run a function on a specific CPU * @cpu: The target CPU. Cannot be the calling CPU. * @func: The function to run. This must be fast and non-blocking. * @info: An arbitrary pointer to pass to the function. @@ -66,9 +66,11 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int ret; int me = get_cpu(); if (cpu == me) { - WARN_ON(1); + local_irq_disable(); + func(info); + local_irq_enable(); put_cpu(); - return -EBUSY; + return 0; } ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait); |
