diff --git a/[refs] b/[refs]
index eff8807143a4..0844ae71e8f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f957d1f05a1a20bc3b954877c6562a4d53d58bde
+refs/heads/master: 3309daaad724dd08eb598bf9c12b7bb9daddd706
diff --git a/trunk/include/linux/virtio_ring.h b/trunk/include/linux/virtio_ring.h
index 8cde10e792c4..ea3be89a0e83 100644
--- a/trunk/include/linux/virtio_ring.h
+++ b/trunk/include/linux/virtio_ring.h
@@ -89,7 +89,7 @@ struct vring {
  * };
  */
 static inline void vring_init(struct vring *vr, unsigned int num, void *p,
-			      unsigned int pagesize)
+			      unsigned long pagesize)
 {
 	vr->num = num;
 	vr->desc = p;
@@ -98,7 +98,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p,
 			    & ~(pagesize - 1));
 }
 
-static inline unsigned vring_size(unsigned int num, unsigned int pagesize)
+static inline unsigned vring_size(unsigned int num, unsigned long pagesize)
 {
 	return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (2 + num)
 		 + pagesize - 1) & ~(pagesize - 1))