diff options
Diffstat (limited to 'arch/ia64/kernel/smp.c')
-rw-r--r-- | arch/ia64/kernel/smp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index 0982882bfb80..4e446aa5f4ac 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
@@ -346,7 +346,7 @@ smp_flush_tlb_mm (struct mm_struct *mm) | |||
346 | } | 346 | } |
347 | 347 | ||
348 | /* | 348 | /* |
349 | * Run a function on another CPU | 349 | * Run a function on a specific CPU |
350 | * <func> The function to run. This must be fast and non-blocking. | 350 | * <func> The function to run. This must be fast and non-blocking. |
351 | * <info> An arbitrary pointer to pass to the function. | 351 | * <info> An arbitrary pointer to pass to the function. |
352 | * <nonatomic> Currently unused. | 352 | * <nonatomic> Currently unused. |
@@ -366,9 +366,11 @@ smp_call_function_single (int cpuid, void (*func) (void *info), void *info, int | |||
366 | int me = get_cpu(); /* prevent preemption and reschedule on another processor */ | 366 | int me = get_cpu(); /* prevent preemption and reschedule on another processor */ |
367 | 367 | ||
368 | if (cpuid == me) { | 368 | if (cpuid == me) { |
369 | printk(KERN_INFO "%s: trying to call self\n", __FUNCTION__); | 369 | local_irq_disable(); |
370 | func(info); | ||
371 | local_irq_enable(); | ||
370 | put_cpu(); | 372 | put_cpu(); |
371 | return -EBUSY; | 373 | return 0; |
372 | } | 374 | } |
373 | 375 | ||
374 | data.func = func; | 376 | data.func = func; |