Skip to content

Commit b96ddbc

Browse files
committed
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
2 parents 7d2fed1 + da27485 commit b96ddbc

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

kernel/cpu.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,9 +1309,6 @@ static int takedown_cpu(unsigned int cpu)
13091309
*/
13101310
irq_lock_sparse();
13111311

1312-
/*
1313-
* So now all preempt/rcu users must observe !cpu_active().
1314-
*/
13151312
err = stop_machine_cpuslocked(take_cpu_down, NULL, cpumask_of(cpu));
13161313
if (err) {
13171314
/* CPU refused to die */

kernel/smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ void __init smp_init(void)
10181018
* @cond_func: A callback function that is passed a cpu id and
10191019
* the info parameter. The function is called
10201020
* with preemption disabled. The function should
1021-
* return a blooean value indicating whether to IPI
1021+
* return a boolean value indicating whether to IPI
10221022
* the specified CPU.
10231023
* @func: The function to run on all applicable CPUs.
10241024
* This must be fast and non-blocking.

0 commit comments

Comments
 (0)