diff --git a/[refs] b/[refs]
index cd2baca4f0d6..43d57fe137f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25cccecce8e29f92eb5a0445bc97ee01ef2da379
+refs/heads/master: 6d14bfe77b8246a45670b7158d3a49bfe55662c7
diff --git a/trunk/drivers/lguest/io.c b/trunk/drivers/lguest/io.c
index 06bdba2337ef..c8eb79266991 100644
--- a/trunk/drivers/lguest/io.c
+++ b/trunk/drivers/lguest/io.c
@@ -187,7 +187,7 @@ static u32 copy_data(struct lguest *srclg,
 		/* FIXME: This is not completely portable, since
 		   archs do different things for copy_to_user_page. */
 		if (copy_from_user(maddr + (dst->addr[di] + dstoff)%PAGE_SIZE,
-				   (void *__user)src->addr[si], len) != 0) {
+				   (void __user *)src->addr[si], len) != 0) {
 			kill_guest(srclg, "bad address in sending DMA");
 			totlen = 0;
 			break;