History

Merge tag 'smp-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull SMP fixes from Thomas Gleixner: "Two fixes for the SMP related functionality: - Make the UP version of smp_call_function_single() match SMP semantics when called for a not available CPU. Instead of emitting a warning and assuming that the function call target is CPU0, return a proper error code like the SMP version does. - Remove a superfluous check in smp_call_function_many_cond()" * tag 'smp-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: smp/up: Make smp_call_function_single() match SMP semantics smp: Remove superfluous cond_func check in smp_call_function_many_cond()

Linus Torvalds committed 6 years ago

Commit f4137762 parents ca21b9b 1e474b22 files · +3 −2Browse files

Showing the changes to kernel (2 of 2 files). Show all

Unified · Split

2 files
  1. kernel/smp.c +1 −1
  2. kernel/up.c +2 −1
kernel/smp.c+1−1
@@ -435,7 +435,7 @@ static void smp_call_function_many_cond(const struct cpumask *mask, · 434 unmodified lines
435 435
436 /* Fastpath: do that cpu by itself. */436 /* Fastpath: do that cpu by itself. */
437 if (next_cpu >= nr_cpu_ids) {437 if (next_cpu >= nr_cpu_ids) {
438 if (!cond_func || (cond_func && cond_func(cpu, info)))438 if (!cond_func || cond_func(cpu, info))
439 smp_call_function_single(cpu, func, info, wait);439 smp_call_function_single(cpu, func, info, wait);
440 return;440 return;
441 }441 }
kernel/up.c+2−1
@@ -14,7 +14,8 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, · 13 unmodified lines
14{14{
15 unsigned long flags;15 unsigned long flags;
16 16
17 WARN_ON(cpu != 0);17 if (cpu != 0)
18 return -ENXIO;
18 19
19 local_irq_save(flags);20 local_irq_save(flags);
20 func(info);21 func(info);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t