diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-03 16:14:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-03 16:14:18 +0300 |
| commit | 475c5ee193fd682c6383b5e418e65e46a477d176 (patch) | |
| tree | 43f70a77d919e10237edbbbc3ca7ac8076d27410 /drivers/vhost | |
| parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d (diff) | |
| parent | 1dfa55e01987288d847220b8c027204871440ed1 (diff) | |
| download | linux-475c5ee193fd682c6383b5e418e65e46a477d176.tar.xz | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Updates to use cond_resched() instead of cond_resched_rcu_qs()
where feasible (currently everywhere except in kernel/rcu and
in kernel/torture.c). Also a couple of fixes to avoid sending
IPIs to offline CPUs.
- Updates to simplify RCU's dyntick-idle handling.
- Updates to remove almost all uses of smp_read_barrier_depends()
and read_barrier_depends().
- Miscellaneous fixes.
- Torture-test updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 33ac2b186b85..78b5940a415a 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1877,12 +1877,7 @@ static unsigned next_desc(struct vhost_virtqueue *vq, struct vring_desc *desc) return -1U; /* Check they're not leading us off end of descriptors. */ - next = vhost16_to_cpu(vq, desc->next); - /* Make sure compiler knows to grab that: we don't want it changing! */ - /* We will use the result as an index in an array, so most - * architectures only need a compiler barrier here. */ - read_barrier_depends(); - + next = vhost16_to_cpu(vq, READ_ONCE(desc->next)); return next; } |