Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/

[linux-2.6] / include / asm-alpha / smp.h

diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
index a3d09d14fee2645a1994eebeb1163072beb8b599..9950706abdf8289f0d2815dd45102aa787016038 100644 (file)
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
@@ -50,16 +50,11 @@ extern cpumask_t cpu_online_map;
 extern int smp_num_cpus;
 #define cpu_possible_map       cpu_present_mask
 
-int smp_call_function_on_cpu(void (*) (void *), void *, int, int, cpumask_t);
+int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu);
 
 #else /* CONFIG_SMP */
 
-static inline int
-smp_call_function_on_cpu (void (*func) (void *), void *info, int retry,
-                         int wait, cpumask_t cpu)
-{
-       return 0;
-}
+#define smp_call_function_on_cpu(func,info,retry,wait,cpu)    ({ 0; })
 
 #endif /* CONFIG_SMP */