diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
commit | acd632eb64b6cd8e25583bb248c36aa937b8f021 (patch) | |
tree | 993d276cbadb450fe8cf5e3c66d444a905d452e7 /include/uapi/linux/virtio_ring.h | |
parent | 4b0c53e9e1a2a785746b2d379a32cb70b4dbb2fd (diff) | |
parent | 5542b2aa9eea3f2bb922029c8cc4b4346c4f6b1c (diff) |
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/virtio_ring.h')
-rw-r--r-- | include/uapi/linux/virtio_ring.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h index 915980ac68df..c07295969b7e 100644 --- a/include/uapi/linux/virtio_ring.h +++ b/include/uapi/linux/virtio_ring.h @@ -31,6 +31,9 @@ * SUCH DAMAGE. * * Copyright Rusty Russell IBM Corporation 2007. */ +#ifndef __KERNEL__ +#include <stdint.h> +#endif #include <linux/types.h> #include <linux/virtio_types.h> @@ -143,7 +146,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p, vr->num = num; vr->desc = p; vr->avail = p + num*sizeof(struct vring_desc); - vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + sizeof(__virtio16) + vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16) + align-1) & ~(align - 1)); } |