aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/asm-alpha/smp.h9
-rw-r--r--include/linux/smp.h20
2 files changed, 23 insertions, 6 deletions
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
index 9950706abdf..a3d09d14fee 100644
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
@@ -50,11 +50,16 @@ 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 (*func) (void *info), void *info,int retry, int wait, cpumask_t cpu);
+int smp_call_function_on_cpu(void (*) (void *), void *, int, int, cpumask_t);
#else /* CONFIG_SMP */
-#define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
+static inline int
+smp_call_function_on_cpu (void (*func) (void *), void *info, int retry,
+ int wait, cpumask_t cpu)
+{
+ return 0;
+}
#endif /* CONFIG_SMP */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 9dfa3ee769a..22b451d1b93 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -94,11 +94,23 @@ void smp_prepare_boot_cpu(void);
*/
#define raw_smp_processor_id() 0
#define hard_smp_processor_id() 0
-#define smp_call_function(func,info,retry,wait) ({ 0; })
-#define on_each_cpu(func,info,retry,wait) ({ func(info); 0; })
-static inline void smp_send_reschedule(int cpu) { }
#define num_booting_cpus() 1
-#define smp_prepare_boot_cpu() do {} while (0)
+
+static inline int smp_call_function(void (*func) (void *), void *info,
+ int retry, int wait)
+{
+ return 0;
+}
+
+static inline int on_each_cpu(void (*func) (void *), void *info,
+ int retry, int wait)
+{
+ func(info);
+ return 0;
+}
+
+static inline void smp_send_reschedule(int cpu) { }
+static inline void smp_prepare_boot_cpu(void) { }
#endif /* !SMP */