X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Finclude%2Fuapi%2Flinux%2Fvirtio_ring.h;h=c07295969b7e134ec85bf58b72b100949a6462fa;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=915980ac68dfa8cc1dc973b8a7e659fc56383c22;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git diff --git a/kernel/include/uapi/linux/virtio_ring.h b/kernel/include/uapi/linux/virtio_ring.h index 915980ac6..c07295969 100644 --- 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. */ +#ifndef __KERNEL__ +#include +#endif #include #include @@ -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)); }