Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee0861f authored by Abel Vesa's avatar Abel Vesa Committed by Greg Kroah-Hartman
Browse files

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: default avatarAbel Vesa <abelvesa@linux.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59a6e1f2

kernel/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -2201,6 +2201,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);

}