diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:53:40 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:53:40 -0600 |
| commit | ce34cf72fe508b27a78f83c184142e8d1e6a048a (patch) | |
| tree | ccc8c7d0c430edcacac6052b58495478928346d1 /linux-headers/linux/virtio_ring.h | |
| parent | 662d263f280f6cfc82263a687b8322b69d2ed7db (diff) | |
| parent | a771c51703cf9f91023c6570426258bdf5ec775b (diff) | |
| download | focaccia-qemu-ce34cf72fe508b27a78f83c184142e8d1e6a048a.tar.gz focaccia-qemu-ce34cf72fe508b27a78f83c184142e8d1e6a048a.zip | |
Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0' into staging
vfio-pci: KVM INTx accel & common msi_get_message * awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0: vfio-pci: Use common msi_get_message vfio-pci: Add KVM INTx acceleration linux-headers: Update to 3.7-rc5 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'linux-headers/linux/virtio_ring.h')
| -rw-r--r-- | linux-headers/linux/virtio_ring.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-headers/linux/virtio_ring.h b/linux-headers/linux/virtio_ring.h index 1b333e2536..921694a084 100644 --- a/linux-headers/linux/virtio_ring.h +++ b/linux-headers/linux/virtio_ring.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_VIRTIO_RING_H -#define _LINUX_VIRTIO_RING_H +#ifndef _UAPI_LINUX_VIRTIO_RING_H +#define _UAPI_LINUX_VIRTIO_RING_H /* An interface for efficient virtio implementation, currently for use by KVM * and lguest, but hopefully others soon. Do NOT change this since it will * break existing servers and clients. @@ -160,4 +160,4 @@ static __inline__ int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old return (__u16)(new_idx - event_idx - 1) < (__u16)(new_idx - old); } -#endif /* _LINUX_VIRTIO_RING_H */ +#endif /* _UAPI_LINUX_VIRTIO_RING_H */ |