Pull SMP/hotplug updates from Thomas Gleixner: "A small set of updates for SMP and CPU hotplug: - Abort disabling secondary CPUs in the freezer when a wakeup is pending instead of evaluating it only after all CPUs have been offlined. - Remove the shared annotation for the strict per CPU cfd_data in the smp function call core code. - Remove the return values of smp_call_function() and on_each_cpu() as they are unconditionally 0. Fixup the few callers which actually bothered to check the return value" * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: smp: Remove smp_call_function() and on_each_cpu() return values smp: Do not mark call_function_data as shared cpu/hotplug: Abort disabling secondary CPUs if wakeup is pending cpu/hotplug: Fix notify_cpu_starting() reference in bringup_wait_for_ap()
Showing the changes to include/linux (1 of 12 files). Show all
Unified · Split
| @@ -35,7 +35,7 @@ int smp_call_function_single(int cpuid, smp_call_func_t func, void *info, · 34 unmodified lines | |||
| 35 | /* | 35 | /* |
| 36 | * Call a function on all processors | 36 | * Call a function on all processors |
| 37 | */ | 37 | */ |
| 38 | int on_each_cpu(smp_call_func_t func, void *info, int wait); | 38 | void on_each_cpu(smp_call_func_t func, void *info, int wait); |
| 39 | 39 | ||
| 40 | /* | 40 | /* |
| 41 | * Call a function on processors specified by mask, which might include | 41 | * Call a function on processors specified by mask, which might include |
| @@ -101,7 +101,7 @@ extern void smp_cpus_done(unsigned int max_cpus); · 59 unmodified lines | |||
| 101 | /* | 101 | /* |
| 102 | * Call a function on all other processors | 102 | * Call a function on all other processors |
| 103 | */ | 103 | */ |
| 104 | int smp_call_function(smp_call_func_t func, void *info, int wait); | 104 | void smp_call_function(smp_call_func_t func, void *info, int wait); |
| 105 | void smp_call_function_many(const struct cpumask *mask, | 105 | void smp_call_function_many(const struct cpumask *mask, |
| 106 | smp_call_func_t func, void *info, bool wait); | 106 | smp_call_func_t func, void *info, bool wait); |
| 107 | 107 | ||
| @@ -144,9 +144,8 @@ static inline void smp_send_stop(void) { } · 36 unmodified lines | |||
| 144 | * These macros fold the SMP functionality into a single CPU system | 144 | * These macros fold the SMP functionality into a single CPU system |
| 145 | */ | 145 | */ |
| 146 | #define raw_smp_processor_id() 0 | 146 | #define raw_smp_processor_id() 0 |
| 147 | static inline int up_smp_call_function(smp_call_func_t func, void *info) | 147 | static inline void up_smp_call_function(smp_call_func_t func, void *info) |
| 148 | { | 148 | { |
| 149 | return 0; | ||
| 150 | } | 149 | } |
| 151 | #define smp_call_function(func, info, wait) \ | 150 | #define smp_call_function(func, info, wait) \ |
| 152 | (up_smp_call_function(func, info)) | 151 | (up_smp_call_function(func, info)) |