diff options
Diffstat (limited to 'arch/i386/kernel/smpcommon.c')
-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 1868ae18eb4d..bbfe85a0f699 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, | |||
47 | EXPORT_SYMBOL(smp_call_function); | 47 | EXPORT_SYMBOL(smp_call_function); |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * smp_call_function_single - Run a function on another CPU | 50 | * smp_call_function_single - Run a function on a specific CPU |
51 | * @cpu: The target CPU. Cannot be the calling CPU. | 51 | * @cpu: The target CPU. Cannot be the calling CPU. |
52 | * @func: The function to run. This must be fast and non-blocking. | 52 | * @func: The function to run. This must be fast and non-blocking. |
53 | * @info: An arbitrary pointer to pass to the function. | 53 | * @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, | |||
66 | int ret; | 66 | int ret; |
67 | int me = get_cpu(); | 67 | int me = get_cpu(); |
68 | if (cpu == me) { | 68 | if (cpu == me) { |
69 | WARN_ON(1); | 69 | local_irq_disable(); |
70 | func(info); | ||
71 | local_irq_enable(); | ||
70 | put_cpu(); | 72 | put_cpu(); |
71 | return -EBUSY; | 73 | return 0; |
72 | } | 74 | } |
73 | 75 | ||
74 | ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait); | 76 | ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, wait); |