The following commit has been merged into the x86/core branch of tip: Commit-ID: 52defa4a5e719a57992aed52c8d3e214e75ac276 Gitweb: https://git.kernel.org/tip/52defa4a5e719a57992aed52c8d3e214e75ac276 Author: Sohil Mehta <sohil.mehta@xxxxxxxxx> AuthorDate: Thu, 27 Jul 2023 18:05:31 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Fri, 28 Jul 2023 10:17:53 +02:00 x86/smpboot: Remove a stray comment about CPU hotplug This old comment is irrelavant to the logic of disabling interrupts and could be misleading. Remove it. Now, hlt_play_dead() resembles the code that the comment was initially added for, but, it doesn't make sense anymore because an offlined cpu could also be put into other states such as mwait. Signed-off-by: Sohil Mehta <sohil.mehta@xxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230727180533.3119660-2-sohil.mehta@xxxxxxxxx --- arch/x86/kernel/smpboot.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index e1aa2cd..6a09a02 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1614,9 +1614,7 @@ void play_dead_common(void) idle_task_exit(); cpuhp_ap_report_dead(); - /* - * With physical CPU hotplug, we should halt the cpu - */ + local_irq_disable(); }