diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-28 18:16:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-28 18:16:09 -0800 |
| commit | e3b8369ca8f2fd756031dd972224bc70c2364ec2 (patch) | |
| tree | bd4bab77912008a9f112b487616e08a74682f59b | |
| parent | 6c334f4f6aeb0916bfc15ff731073e9f24de0189 (diff) | |
| parent | 13289d5f2b2ee73583e6c65c46a1e0cd48c3ddc0 (diff) | |
| download | linux-e3b8369ca8f2fd756031dd972224bc70c2364ec2.tar.gz linux-e3b8369ca8f2fd756031dd972224bc70c2364ec2.tar.bz2 linux-e3b8369ca8f2fd756031dd972224bc70c2364ec2.zip | |
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
* tag 'for-linus' of git://github.com/rustyrussell/linux:
lguest: remove reference from Documentation/virtual/00-INDEX
virtio: correct the memory barrier in virtqueue_kick_prepare()
virtio: fix typos of memory barriers
| -rw-r--r-- | Documentation/virtual/00-INDEX | 2 | ||||
| -rw-r--r-- | drivers/virtio/virtio_ring.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/virtual/00-INDEX b/Documentation/virtual/00-INDEX index 8e601991d91c..924bd462675e 100644 --- a/Documentation/virtual/00-INDEX +++ b/Documentation/virtual/00-INDEX @@ -4,8 +4,6 @@ Virtualization support in the Linux kernel. - this file. kvm/ - Kernel Virtual Machine. See also http://linux-kvm.org -lguest/ - - Extremely simple hypervisor for experimental/educational use. uml/ - User Mode Linux, builds/runs Linux kernel as a userspace program. virtio.txt diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 79e1b292c030..5aa43c3392a2 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -35,7 +35,7 @@ #define virtio_rmb(vq) \ do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) #define virtio_wmb(vq) \ - do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) + do { if ((vq)->weak_barriers) smp_wmb(); else wmb(); } while(0) #else /* We must force memory ordering even if guest is UP since host could be * running on another CPU, but SMP barriers are defined to barrier() in that @@ -308,9 +308,9 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq) bool needs_kick; START_USE(vq); - /* Descriptors and available array need to be set before we expose the - * new available array entries. */ - virtio_wmb(vq); + /* We need to expose available array entries before checking avail + * event. */ + virtio_mb(vq); old = vq->vring.avail->idx - vq->num_added; new = vq->vring.avail->idx; |