From ea18d4ab0718b290727e7ba23dc60f5956183fa4 Mon Sep 17 00:00:00 2001
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 21 Dec 2007 02:17:47 +0200
Subject: [PATCH] --- yaml --- r: 82815 b: refs/heads/master c:
 3309daaad724dd08eb598bf9c12b7bb9daddd706 h: refs/heads/master i:   82813:
 2eed816fb1f2cfa0f57da677fcc35b1457274fe1   82811:
 53fbae39dd89a66678216f428cd43d24782474a4   82807:
 edf9ca49734618cf57caa77d4f3943bf81171efe   82799:
 23ab2707d175b13c8126e8ab1d92039f2bde7a5a   82783:
 dbdfdd6a2c2a52ef0fc598049bd95d800fafdd77   82751:
 f2c04f17ce122fd675cf59e05b091383ee49bfbd   82687:
 2fedd354574f7338045ec54f5d7a758514dc635a v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/virtio_ring.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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))