From 46151890dbb7b583cc47855c08bb924523475d02 Mon Sep 17 00:00:00 2001 From: Wang Sheng-Hui Date: Mon, 29 Aug 2011 15:55:59 +0800 Subject: [PATCH] --- yaml --- r: 273205 b: refs/heads/master c: 00b894e874581f6b388c5817d4d5546c22cf9640 h: refs/heads/master i: 273203: c87ad5ef6423f22f50533909d646637b79abf9b2 v: v3 --- [refs] | 2 +- trunk/include/linux/virtio_ring.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 938318ab83c2..abe462d36bb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f41f8bfc95e84536207b2af8918f2e674164a42 +refs/heads/master: 00b894e874581f6b388c5817d4d5546c22cf9640 diff --git a/trunk/include/linux/virtio_ring.h b/trunk/include/linux/virtio_ring.h index 4a32cb6da425..36be0f6e18a9 100644 --- a/trunk/include/linux/virtio_ring.h +++ b/trunk/include/linux/virtio_ring.h @@ -135,13 +135,13 @@ 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] + align-1) - & ~(align - 1)); + vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + sizeof(__u16) + + align-1) & ~(align - 1)); } static inline unsigned vring_size(unsigned int num, unsigned long align) { - return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (2 + num) + return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (3 + num) + align - 1) & ~(align - 1)) + sizeof(__u16) * 3 + sizeof(struct vring_used_elem) * num; }