Commit 371fb854 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents e563592c 13070833

kernel/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static int takedown_cpu(unsigned int cpu) 
	int err;



	/* Park the smpboot threads */

	kthread_park(per_cpu_ptr(&cpuhp_state, cpu)->thread);

	kthread_park(st->thread);



	/*

	 * Prevent irq alloc/free while the dying cpu reorganizes the
@@ -977,7 +977,7 @@ static int takedown_cpu(unsigned int cpu) 
		/* CPU refused to die */

		irq_unlock_sparse();

		/* Unpark the hotplug thread so we can rollback there */

		kthread_unpark(per_cpu_ptr(&cpuhp_state, cpu)->thread);

		kthread_unpark(st->thread);

		return err;

	}

	BUG_ON(cpu_online(cpu));