diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 07:11:02 -0400 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /drivers/virtio/virtio_ring.c | |
| parent | a8f75ea70c58546205fb7673be41455b9da5d9a7 (diff) | |
| parent | 120dd64cacd4fb796bca0acba3665553f1d9ecaa (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/virtio/virtio_ring.c')
| -rw-r--r-- | drivers/virtio/virtio_ring.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index aa714028641e..c2fa5c630813 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c | |||
| @@ -214,10 +214,7 @@ static void vring_disable_cb(struct virtqueue *_vq) | |||
| 214 | { | 214 | { |
| 215 | struct vring_virtqueue *vq = to_vvq(_vq); | 215 | struct vring_virtqueue *vq = to_vvq(_vq); |
| 216 | 216 | ||
| 217 | START_USE(vq); | ||
| 218 | BUG_ON(vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT); | ||
| 219 | vq->vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT; | 217 | vq->vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT; |
| 220 | END_USE(vq); | ||
| 221 | } | 218 | } |
| 222 | 219 | ||
| 223 | static bool vring_enable_cb(struct virtqueue *_vq) | 220 | static bool vring_enable_cb(struct virtqueue *_vq) |