Commit b96ddbc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'smp_urgent_for_v6.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull smp fixes from Borislav Petkov:

 - Remove an obsolete comment and fix spelling

* tag 'smp_urgent_for_v6.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu: Remove obsolete comment from takedown_cpu()
  smp: Fix spelling in on_each_cpu_cond_mask()'s doc-comment
parents 7d2fed1f da274853

kernel/cpu.c

+0 −3
Original line number Diff line number Diff line
@@ -1309,9 +1309,6 @@ static int takedown_cpu(unsigned int cpu) 
	 */

	irq_lock_sparse();



	/*

	 * So now all preempt/rcu users must observe !cpu_active().

	 */

	err = stop_machine_cpuslocked(take_cpu_down, NULL, cpumask_of(cpu));

	if (err) {

		/* CPU refused to die */

kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ void __init smp_init(void) 
 * @cond_func:	A callback function that is passed a cpu id and

 *		the info parameter. The function is called

 *		with preemption disabled. The function should

 *		return a blooean value indicating whether to IPI

 *		return a boolean value indicating whether to IPI

 *		the specified CPU.

 * @func:	The function to run on all applicable CPUs.

 *		This must be fast and non-blocking.