Pull CPU hotplug updates from Ingo Molnar: "Two changes in this cycle: - Make the /sys/devices/system/cpu/smt/* files available on all arches, so user space has a consistent way to detect whether SMT is enabled. - Sparse annotation fix" * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: smpboot: Place the __percpu annotation correctly cpu/hotplug: Create SMT sysfs interface for all arches
Showing the changes to include/linux (2 of 4 files). Show all
Unified · Split
| @@ -192,6 +192,7 @@ enum cpuhp_smt_control { · 191 unmodified lines | |||
| 192 | CPU_SMT_DISABLED, | 192 | CPU_SMT_DISABLED, |
| 193 | CPU_SMT_FORCE_DISABLED, | 193 | CPU_SMT_FORCE_DISABLED, |
| 194 | CPU_SMT_NOT_SUPPORTED, | 194 | CPU_SMT_NOT_SUPPORTED, |
| 195 | CPU_SMT_NOT_IMPLEMENTED, | ||
| 195 | }; | 196 | }; |
| 196 | 197 | ||
| 197 | #if defined(CONFIG_SMP) && defined(CONFIG_HOTPLUG_SMT) | 198 | #if defined(CONFIG_SMP) && defined(CONFIG_HOTPLUG_SMT) |
| @@ -199,7 +200,7 @@ extern enum cpuhp_smt_control cpu_smt_control; · 1 unmodified line | |||
| 199 | extern void cpu_smt_disable(bool force); | 200 | extern void cpu_smt_disable(bool force); |
| 200 | extern void cpu_smt_check_topology(void); | 201 | extern void cpu_smt_check_topology(void); |
| 201 | #else | 202 | #else |
| 202 | # define cpu_smt_control (CPU_SMT_ENABLED) | 203 | # define cpu_smt_control (CPU_SMT_NOT_IMPLEMENTED) |
| 203 | static inline void cpu_smt_disable(bool force) { } | 204 | static inline void cpu_smt_disable(bool force) { } |
| 204 | static inline void cpu_smt_check_topology(void) { } | 205 | static inline void cpu_smt_check_topology(void) { } |
| 205 | #endif | 206 | #endif |
| @@ -29,7 +29,7 @@ struct smpboot_thread_data; · 28 unmodified lines | |||
| 29 | * @thread_comm: The base name of the thread | 29 | * @thread_comm: The base name of the thread |
| 30 | */ | 30 | */ |
| 31 | struct smp_hotplug_thread { | 31 | struct smp_hotplug_thread { |
| 32 | struct task_struct __percpu **store; | 32 | struct task_struct * __percpu *store; |
| 33 | struct list_head list; | 33 | struct list_head list; |
| 34 | int (*thread_should_run)(unsigned int cpu); | 34 | int (*thread_should_run)(unsigned int cpu); |
| 35 | void (*thread_fn)(unsigned int cpu); | 35 | void (*thread_fn)(unsigned int cpu); |