From 81ee20af1ebe34276cf5a960c9e46d9835dd32f5 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 15 Dec 2005 09:19:10 +0000
Subject: [PATCH] --- yaml --- r: 15190 b: refs/heads/master c:
 ebbd1bce79b3b4778d9e1914a22c42fcfa869cd9 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/syscalls.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 684c6925a630..13e617e10627 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81f0a91e8f58a7784afe39cda9ac47e9231412a4
+refs/heads/master: ebbd1bce79b3b4778d9e1914a22c42fcfa869cd9
diff --git a/trunk/arch/powerpc/kernel/syscalls.c b/trunk/arch/powerpc/kernel/syscalls.c
index f72ced11212d..91b93d917b64 100644
--- a/trunk/arch/powerpc/kernel/syscalls.c
+++ b/trunk/arch/powerpc/kernel/syscalls.c
@@ -247,7 +247,7 @@ long ppc64_personality(unsigned long personality)
 #define OVERRIDE_MACHINE    0
 #endif
 
-static inline int override_machine(char *mach)
+static inline int override_machine(char __user *mach)
 {
 	if (OVERRIDE_MACHINE) {
 		/* change ppc64 to ppc */