summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAbel Vesa <abelvesa@linux.com>2018-08-15 00:26:00 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-14 15:00:00 -0700
commit269777aa530f3438ec1781586cdac0b5fe47b061 (patch)
tree2669d130257c0c3f31856330dd554c219b06c9ea /kernel
parente6ecec342fefc2df01438cb0b8bacdd8641a6418 (diff)
downloadlinux-269777aa530f3438ec1781586cdac0b5fe47b061.tar.bz2
cpu/hotplug: Non-SMP machines do not make use of booted_once
Commit 0cc3cd21657b ("cpu/hotplug: Boot HT siblings at least once") breaks non-SMP builds. [ I suspect the 'bool' fields should just be made to be bitfields and be exposed regardless of configuration, but that's a separate cleanup that I'll leave to the owners of this file for later. - Linus ] Fixes: 0cc3cd21657b ("cpu/hotplug: Boot HT siblings at least once") Cc: Dave Hansen <dave.hansen@intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Signed-off-by: Abel Vesa <abelvesa@linux.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 90ec528a6e32..ed44d7d34c2d 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -2278,6 +2278,8 @@ void __init boot_cpu_init(void)
*/
void __init boot_cpu_hotplug_init(void)
{
+#ifdef CONFIG_SMP
this_cpu_write(cpuhp_state.booted_once, true);
+#endif
this_cpu_write(cpuhp_state.state, CPUHP_ONLINE);
}