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

Pull smp/hotplug fix from Thomas Gleixner:
"Remove an unused variable which is a leftover from the notifier
removal"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu/hotplug: Remove unused but set variable in _cpu_down()

Changed files
-2
kernel
-2
kernel/cpu.c
··· 764 764 { 765 765 struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu); 766 766 int prev_state, ret = 0; 767 - bool hasdied = false; 768 767 769 768 if (num_online_cpus() == 1) 770 769 return -EBUSY; ··· 808 809 cpuhp_kick_ap_work(cpu); 809 810 } 810 811 811 - hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE; 812 812 out: 813 813 cpu_hotplug_done(); 814 814 return ret;