diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-02 15:52:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-02 15:52:56 -0700 |
| commit | 714366f87336b2a3f1cca9a6ba8632d6403283ad (patch) | |
| tree | d2a441cda279590e6fb37075700ad675d2d9b7b8 | |
| parent | Merge tag 'erofs-for-5.4-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs (diff) | |
| parent | membarrier: Fix RCU locking bug caused by faulty merge (diff) | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull membarrier fix from Ingo Molnar:
"Fix broken locking within membarrier_private_expedited()"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
membarrier: Fix RCU locking bug caused by faulty merge
| -rw-r--r-- | kernel/sched/membarrier.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched/membarrier.c b/kernel/sched/membarrier.c index a39bed2c784f..168479a7d61b 100644 --- a/kernel/sched/membarrier.c +++ b/kernel/sched/membarrier.c @@ -174,7 +174,6 @@ static int membarrier_private_expedited(int flags) */ if (cpu == raw_smp_processor_id()) continue; - rcu_read_lock(); p = rcu_dereference(cpu_rq(cpu)->curr); if (p && p->mm == mm) __cpumask_set_cpu(cpu, tmpmask); |