summaryrefslogtreecommitdiffstats
path: root/include/linux/cpu.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-06 14:44:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-06 14:44:49 -0700
commit5a2bf1abbf96fca02b9785c252e569ef8e004851 (patch)
treeba3e9aef86a5868b46a24e8065428a88a72e1bf3 /include/linux/cpu.h
parente00d4135751bfe786a9e26b5560b185ce3f9f963 (diff)
parentd4645d30b50d1691c26ff0f8fa4e718b08f8d3bb (diff)
downloadlinux-stable-5a2bf1abbf96fca02b9785c252e569ef8e004851.tar.gz
linux-stable-5a2bf1abbf96fca02b9785c252e569ef8e004851.tar.bz2
linux-stable-5a2bf1abbf96fca02b9785c252e569ef8e004851.zip
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
Diffstat (limited to 'include/linux/cpu.h')
-rw-r--r--include/linux/cpu.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 2d62f01108a0..732745f865b7 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -192,6 +192,7 @@ enum cpuhp_smt_control {
CPU_SMT_DISABLED,
CPU_SMT_FORCE_DISABLED,
CPU_SMT_NOT_SUPPORTED,
+ CPU_SMT_NOT_IMPLEMENTED,
};
#if defined(CONFIG_SMP) && defined(CONFIG_HOTPLUG_SMT)
@@ -199,7 +200,7 @@ extern enum cpuhp_smt_control cpu_smt_control;
extern void cpu_smt_disable(bool force);
extern void cpu_smt_check_topology(void);
#else
-# define cpu_smt_control (CPU_SMT_ENABLED)
+# define cpu_smt_control (CPU_SMT_NOT_IMPLEMENTED)
static inline void cpu_smt_disable(bool force) { }
static inline void cpu_smt_check_topology(void) { }
#endif