diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-09 21:09:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-09 21:09:43 +0100 |
| commit | f41377609a722fec65f4b0df4e8dc5ea946fb866 (patch) | |
| tree | 76f3a488415536ee5d8d06e3590b1c07133f1a8d /kernel | |
| parent | Merge tag 'perf-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | smp/up: Make smp_call_function_single() match SMP semantics (diff) | |
| download | linux-f41377609a722fec65f4b0df4e8dc5ea946fb866.tar.xz linux-f41377609a722fec65f4b0df4e8dc5ea946fb866.zip | |
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()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/smp.c | 2 | ||||
| -rw-r--r-- | kernel/up.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/smp.c b/kernel/smp.c index 3b7bedc97af3..d0ada39eb4d4 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -435,7 +435,7 @@ static void smp_call_function_many_cond(const struct cpumask *mask, /* Fastpath: do that cpu by itself. */ if (next_cpu >= nr_cpu_ids) { - if (!cond_func || (cond_func && cond_func(cpu, info))) + if (!cond_func || cond_func(cpu, info)) smp_call_function_single(cpu, func, info, wait); return; } diff --git a/kernel/up.c b/kernel/up.c index 53144d056252..c6f323dcd45b 100644 --- a/kernel/up.c +++ b/kernel/up.c @@ -14,7 +14,8 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, { unsigned long flags; - WARN_ON(cpu != 0); + if (cpu != 0) + return -ENXIO; local_irq_save(flags); func(info); |