Merge tag 'smp-core-2021-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull CPU hotplug cleanup from Thomas Gleixner:
"A simple cleanup for the CPU hotplug code to avoid per_cpu_ptr()
reevaluation"

* tag 'smp-core-2021-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu/hotplug: Simplify access to percpu cpuhp_state

Linus Torvalds 4 years ago 371fb854 e563592c

+2 -2

1 changed file

expand all

kernel

cpu.c

+2 -2

kernel/cpu.c

··· 961 961 int err; 962 962 963 963 /* Park the smpboot threads */ 964 - kthread_park(per_cpu_ptr(&cpuhp_state, cpu)->thread); 964 + kthread_park(st->thread); 965 965 966 966 /* 967 967 * Prevent irq alloc/free while the dying cpu reorganizes the ··· 977 977 /* CPU refused to die */ 978 978 irq_unlock_sparse(); 979 979 /* Unpark the hotplug thread so we can rollback there */ 980 - kthread_unpark(per_cpu_ptr(&cpuhp_state, cpu)->thread); 980 + kthread_unpark(st->thread); 981 981 return err; 982 982 } 983 983 BUG_ON(cpu_online(cpu));