Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
include
/
uapi
/
linux
/
virtio_ring.h
diff --git
a/kernel/include/uapi/linux/virtio_ring.h
b/kernel/include/uapi/linux/virtio_ring.h
index
915980a
..
c072959
100644
(file)
--- a/
kernel/include/uapi/linux/virtio_ring.h
+++ b/
kernel/include/uapi/linux/virtio_ring.h
@@
-31,6
+31,9
@@
* SUCH DAMAGE.
*
* Copyright Rusty Russell IBM Corporation 2007. */
* SUCH DAMAGE.
*
* Copyright Rusty Russell IBM Corporation 2007. */
+#ifndef __KERNEL__
+#include <stdint.h>
+#endif
#include <linux/types.h>
#include <linux/virtio_types.h>
#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->num = num;
vr->desc = p;
vr->avail = p + num*sizeof(struct vring_desc);
- vr->used = (void *)(((u
nsigned long
)&vr->avail->ring[num] + sizeof(__virtio16)
+ vr->used = (void *)(((u
intptr_t
)&vr->avail->ring[num] + sizeof(__virtio16)
+ align-1) & ~(align - 1));
}
+ align-1) & ~(align - 1));
}