diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-17 09:52:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-17 09:52:19 -0700 |
| commit | 84841384ec6ec57544b76e564514d3f9eb6c1901 (patch) | |
| tree | 3af1373f62d3f15c2473bf1034757cd1d0122c0b /include | |
| parent | 3d10a15d6919488204bdb264050d156ced20d9aa (diff) | |
| parent | 4265f161b6bb7b31163671329b1142b9023bf4e3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio: fix race in enable_cb
virtio: Enable netpoll interface for netconsole logging
virtio: handle > 2 billion page balloon targets
virtio: Fix sysfs bits to have proper block symlink
virtio: Use spin_lock_irqsave/restore for virtio-pci
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/virtio.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 260d1fcf29a4..12c18ac1b973 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -43,8 +43,9 @@ struct virtqueue * vq: the struct virtqueue we're talking about. * @enable_cb: restart callbacks after disable_cb. * vq: the struct virtqueue we're talking about. - * This returns "false" (and doesn't re-enable) if there are pending - * buffers in the queue, to avoid a race. + * This re-enables callbacks; it returns "false" if there are pending + * buffers in the queue, to detect a possible race between the driver + * checking for more work, and enabling callbacks. * * Locking rules are straightforward: the driver is responsible for * locking. No two operations may be invoked simultaneously. |