Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / kernel / up.c

diff --git a/kernel/up.c b/kernel/up.c
index 509403e3fbc6b5bffbef9ecaa47cad6c68c03c3f..1760bf3d14636266eae1f81aa84f277076c4335d 100644 (file)
--- a/kernel/up.c
+++ b/kernel/up.c
@@ -22,16 +22,16 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
 }
 EXPORT_SYMBOL(smp_call_function_single);
 
-void __smp_call_function_single(int cpu, struct call_single_data *csd,
-                               int wait)
+int smp_call_function_single_async(int cpu, struct call_single_data *csd)
 {
        unsigned long flags;
 
        local_irq_save(flags);
        csd->func(csd->info);
        local_irq_restore(flags);
+       return 0;
 }
-EXPORT_SYMBOL(__smp_call_function_single);
+EXPORT_SYMBOL(smp_call_function_single_async);
 
 int on_each_cpu(smp_call_func_t func, void *info, int wait)
 {