2 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2d22bf03484e..bce33a38399f 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -183,8 +183,8 @@ syscall_exit_trace_cont:
         ld      r13,GPR13(r1)           /* returning to usermode */
 1:      ld      r2,GPR2(r1)
         li      r12,MSR_RI
-        andc    r10,r10,r12
-        mtmsrd  r10,1                   /* clear MSR.RI */
+        andc    r11,r10,r12
+        mtmsrd  r11,1                   /* clear MSR.RI */
         ld      r1,GPR1(r1)
         mtlr    r4
         mtcr    r5
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index f72ced11212d..91b93d917b64 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/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 */