Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[deliverable/linux.git] / kernel / up.c

diff --git a/kernel/up.c b/kernel/up.c
index cdf03d16840e0d33304ce48d20ad10412c8ea0e3..1760bf3d14636266eae1f81aa84f277076c4335d 100644 (file)
--- a/kernel/up.c
+++ b/kernel/up.c
@@ -22,8 +22,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
 }
 EXPORT_SYMBOL(smp_call_function_single);
 
-int __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;
 
@@ -32,7 +31,7 @@ int __smp_call_function_single(int cpu, struct call_single_data *csd,
        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)
 {