smp: Remove wait argument from __smp_call_function_single()

[deliverable/linux.git] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 3834f43f9993183cf180d1639d1d9d02c3b2721c..b410a1f232812933c05e0ad072a68c2736699384 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -17,10 +17,7 @@ extern void cpu_idle(void);
 
 typedef void (*smp_call_func_t)(void *info);
 struct call_single_data {
-       union {
-               struct list_head list;
-               struct llist_node llist;
-       };
+       struct llist_node llist;
        smp_call_func_t func;
        void *info;
        u16 flags;
@@ -53,8 +50,7 @@ void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),
                smp_call_func_t func, void *info, bool wait,
                gfp_t gfp_flags);
 
-void __smp_call_function_single(int cpuid, struct call_single_data *data,
-                               int wait);
+int __smp_call_function_single(int cpu, struct call_single_data *csd);
 
 #ifdef CONFIG_SMP
 
@@ -188,6 +184,9 @@ static inline void kick_all_cpus_sync(void) {  }
  */
 extern void arch_disable_smp_support(void);
 
+extern void arch_enable_nonboot_cpus_begin(void);
+extern void arch_enable_nonboot_cpus_end(void);
+
 void smp_setup_processor_id(void);
 
 #endif /* __LINUX_SMP_H */