diff options
| author | Abel Vesa <abelvesa@linux.com> | 2018-08-15 00:26:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-15 17:37:34 +0200 |
| commit | f6be6903fc10637c7cd831b267da5427bd0ce653 (patch) | |
| tree | 9f6ba3d5f14be6f9b8efc6bc3692613d4e92bcfa | |
| parent | 3b39dc7463a9867208f68de91f665c2d996f2806 (diff) | |
| download | linux-stable-f6be6903fc10637c7cd831b267da5427bd0ce653.tar.gz linux-stable-f6be6903fc10637c7cd831b267da5427bd0ce653.tar.bz2 linux-stable-f6be6903fc10637c7cd831b267da5427bd0ce653.zip | |
cpu/hotplug: Non-SMP machines do not make use of booted_once
commit 269777aa530f3438ec1781586cdac0b5fe47b061 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 80b606d21913..f80afc674f02 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -2267,6 +2267,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); } |