From d4adbbc575fb48c395879a41a09e4d0d339844c6 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 3 Mar 2009 19:39:32 +0000
Subject: [PATCH] --- yaml --- r: 138528 b: refs/heads/master c:
 2fb4423aa38b598fa688bbd53a835bb7628c445b h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/powerpc/platforms/cell/spufs/file.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 48fb5d790eef..159167bd8b27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d219889b769a56901c9a916187ee0af95e6ff8a6
+refs/heads/master: 2fb4423aa38b598fa688bbd53a835bb7628c445b
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/file.c b/trunk/arch/powerpc/platforms/cell/spufs/file.c
index be0120d9b50a..d6a519e6e1c1 100644
--- a/trunk/arch/powerpc/platforms/cell/spufs/file.c
+++ b/trunk/arch/powerpc/platforms/cell/spufs/file.c
@@ -578,7 +578,7 @@ spufs_regs_write(struct file *file, const char __user *buffer,
 	if (ret)
 		return ret;
 
-	ret = copy_from_user(lscsa->gprs + *pos - size,
+	ret = copy_from_user((char *)lscsa->gprs + *pos - size,
 			     buffer, size) ? -EFAULT : size;
 
 	spu_release_saved(ctx);