Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull SMP fix from Thomas Gleixner:
"Replace the bogus BUG_ON in the cpu hotplug code"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
smp/hotplug: Replace BUG_ON and react useful

+2 -1
+2 -1
kernel/cpu.c
··· 279 279 280 280 /* Wait for the CPU to reach CPUHP_AP_ONLINE_IDLE */ 281 281 wait_for_completion(&st->done); 282 - BUG_ON(!cpu_online(cpu)); 282 + if (WARN_ON_ONCE((!cpu_online(cpu)))) 283 + return -ECANCELED; 283 284 284 285 /* Unpark the stopper thread and the hotplug thread of the target cpu */ 285 286 stop_machine_unpark(cpu);