From af4a53bec6646fd7321ce54ef3a77a655a3962b6 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 11 Oct 2006 17:24:55 +0100
Subject: [PATCH] --- yaml --- r: 39383 b: refs/heads/master c:
 fd2c903b89a6c3cec9388eb24a134ebc1be20747 h: refs/heads/master i:   39381:
 49c43f064955d76227d8d3382afa25f40a1e52c6   39379:
 2b67bb9a1344e55cabbb8006e3d33dddb0709e66   39375:
 51d6e69ca440da73e79afe03adb119e7560f104f v: v3

---
 [refs]                            | 2 +-
 trunk/arch/m32r/kernel/sys_m32r.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d5fd0e6cbc96..f5aed1c72eb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12ea59e8109d7192ecb2ac994588e24b11ab0428
+refs/heads/master: fd2c903b89a6c3cec9388eb24a134ebc1be20747
diff --git a/trunk/arch/m32r/kernel/sys_m32r.c b/trunk/arch/m32r/kernel/sys_m32r.c
index b567351f3c52..b4e7bcb43540 100644
--- a/trunk/arch/m32r/kernel/sys_m32r.c
+++ b/trunk/arch/m32r/kernel/sys_m32r.c
@@ -31,7 +31,7 @@
 /*
  * sys_tas() - test-and-set
  */
-asmlinkage int sys_tas(int *addr)
+asmlinkage int sys_tas(int __user *addr)
 {
 	int oldval;
 
@@ -90,7 +90,7 @@ sys_pipe(unsigned long r0, unsigned long r1, unsigned long r2,
 
 	error = do_pipe(fd);
 	if (!error) {
-		if (copy_to_user((void *)r0, (void *)fd, 2*sizeof(int)))
+		if (copy_to_user((void __user *)r0, fd, 2*sizeof(int)))
 			error = -EFAULT;
 	}
 	return error;
@@ -201,7 +201,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
 	}
 }
 
-asmlinkage int sys_uname(struct old_utsname * name)
+asmlinkage int sys_uname(struct old_utsname __user * name)
 {
 	int err;
 	if (!name)