From f47ee3fcdb5103b9b660b24646af93f55e56bb7f Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Tue, 21 Sep 2010 14:18:01 +0200
Subject: [PATCH] --- yaml --- r: 225153 b: refs/heads/master c:
 dfe5ac5b18be5b10d01a17e734a9905c0def6088 h: refs/heads/master i:   225151:
 47ffeee211eff12e4865b1e76bc41fa667c4ae8f v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/vhost/vhost.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6bed7b087db1..30e21ee62459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64e1c80748afca3b4818ebb232a9668bf529886d
+refs/heads/master: dfe5ac5b18be5b10d01a17e734a9905c0def6088
diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
index c17c881e235a..e6a093187a0e 100644
--- a/trunk/drivers/vhost/vhost.c
+++ b/trunk/drivers/vhost/vhost.c
@@ -1258,7 +1258,7 @@ static int __vhost_add_used_n(struct vhost_virtqueue *vq,
 
 	start = vq->last_used_idx % vq->num;
 	used = vq->used->ring + start;
-	if (copy_to_user(used, heads, count * sizeof *used)) {
+	if (__copy_to_user(used, heads, count * sizeof *used)) {
 		vq_err(vq, "Failed to write used");
 		return -EFAULT;
 	}