Merge branch 'x86/grand-schemozzle' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / kernel / up.c

diff --git a/kernel/up.c b/kernel/up.c
index 483c9962c99947d9e5f86e8cf1aba5019b965959..862b460ab97a8e954c3ac292be94d88670a6fb0c 100644 (file)
--- a/kernel/up.c
+++ b/kernel/up.c
@@ -35,14 +35,13 @@ int smp_call_function_single_async(int cpu, call_single_data_t *csd)
 }
 EXPORT_SYMBOL(smp_call_function_single_async);
 
-int on_each_cpu(smp_call_func_t func, void *info, int wait)
+void on_each_cpu(smp_call_func_t func, void *info, int wait)
 {
        unsigned long flags;
 
        local_irq_save(flags);
        func(info);
        local_irq_restore(flags);
-       return 0;
 }
 EXPORT_SYMBOL(on_each_cpu);