sh: fixup many sparse errors.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 35 insertions, 33 deletions

diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 511a9426cec..4901f673216 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -192,6 +192,7 @@ static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
         int ret, index, count;
         unsigned long *rm, *rn;
         unsigned char *src, *dst;
+        unsigned char __user *srcu, *dstu;
 
         index = (instruction>>8)&15;    /* 0x0F00 */
         rn = &regs->regs[index];
@@ -206,28 +207,28 @@ static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
         case 0: /* mov.[bwl] to/from memory via r0+rn */
                 if (instruction & 8) {
                         /* from memory */
-                        src = (unsigned char*) *rm;
-                        src += regs->regs[0];
-                        dst = (unsigned char*) rn;
-                        *(unsigned long*)dst = 0;
+                        srcu = (unsigned char __user *)*rm;
+                        srcu += regs->regs[0];
+                        dst = (unsigned char *)rn;
+                        *(unsigned long *)dst = 0;
 
 #if !defined(__LITTLE_ENDIAN__)
                         dst += 4-count;
 #endif
-                        if (ma->from(dst, src, count))
+                        if (ma->from(dst, srcu, count))
                                 goto fetch_fault;
 
                         sign_extend(count, dst);
                 } else {
                         /* to memory */
-                        src = (unsigned char*) rm;
+                        src = (unsigned char *)rm;
 #if !defined(__LITTLE_ENDIAN__)
                         src += 4-count;
 #endif
-                        dst = (unsigned char*) *rn;
-                        dst += regs->regs[0];
+                        dstu = (unsigned char __user *)*rn;
+                        dstu += regs->regs[0];
 
-                        if (ma->to(dst, src, count))
+                        if (ma->to(dstu, src, count))
                                 goto fetch_fault;
                 }
                 ret = 0;
@@ -235,10 +236,10 @@ static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
 
         case 1: /* mov.l Rm,@(disp,Rn) */
                 src = (unsigned char*) rm;
-                dst = (unsigned char*) *rn;
-                dst += (instruction&0x000F)<<2;
+                dstu = (unsigned char __user *)*rn;
+                dstu += (instruction&0x000F)<<2;
 
-                if (ma->to(dst, src, 4))
+                if (ma->to(dstu, src, 4))
                         goto fetch_fault;
                 ret = 0;
                 break;
@@ -247,28 +248,28 @@ static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
                 if (instruction & 4)
                         *rn -= count;
                 src = (unsigned char*) rm;
-                dst = (unsigned char*) *rn;
+                dstu = (unsigned char __user *)*rn;
 #if !defined(__LITTLE_ENDIAN__)
                 src += 4-count;
 #endif
-                if (ma->to(dst, src, count))
+                if (ma->to(dstu, src, count))
                         goto fetch_fault;
                 ret = 0;
                 break;
 
         case 5: /* mov.l @(disp,Rm),Rn */
-                src = (unsigned char*) *rm;
-                src += (instruction&0x000F)<<2;
-                dst = (unsigned char*) rn;
-                *(unsigned long*)dst = 0;
+                srcu = (unsigned char __user *)*rm;
+                srcu += (instruction & 0x000F) << 2;
+                dst = (unsigned char *)rn;
+                *(unsigned long *)dst = 0;
 
-                if (ma->from(dst, src, 4))
+                if (ma->from(dst, srcu, 4))
                         goto fetch_fault;
                 ret = 0;
                 break;
 
         case 6: /* mov.[bwl] from memory, possibly with post-increment */
-                src = (unsigned char*) *rm;
+                srcu = (unsigned char __user *)*rm;
                 if (instruction & 4)
                         *rm += count;
                 dst = (unsigned char*) rn;
@@ -277,7 +278,7 @@ static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
 #if !defined(__LITTLE_ENDIAN__)
                 dst += 4-count;
 #endif
-                if (ma->from(dst, src, count))
+                if (ma->from(dst, srcu, count))
                         goto fetch_fault;
                 sign_extend(count, dst);
                 ret = 0;
@@ -286,28 +287,28 @@ static int handle_unaligned_ins(opcode_t instruction, struct pt_regs *regs,
         case 8:
                 switch ((instruction&0xFF00)>>8) {
                 case 0x81: /* mov.w R0,@(disp,Rn) */
-                        src = (unsigned char*) &regs->regs[0];
+                        src = (unsigned char *) &regs->regs[0];
 #if !defined(__LITTLE_ENDIAN__)
                         src += 2;
 #endif
-                        dst = (unsigned char*) *rm; /* called Rn in the spec */
-                        dst += (instruction&0x000F)<<1;
+                        dstu = (unsigned char __user *)*rm; /* called Rn in the spec */
+                        dstu += (instruction & 0x000F) << 1;
 
-                        if (ma->to(dst, src, 2))
+                        if (ma->to(dstu, src, 2))
                                 goto fetch_fault;
                         ret = 0;
                         break;
 
                 case 0x85: /* mov.w @(disp,Rm),R0 */
-                        src = (unsigned char*) *rm;
-                        src += (instruction&0x000F)<<1;
-                        dst = (unsigned char*) &regs->regs[0];
-                        *(unsigned long*)dst = 0;
+                        srcu = (unsigned char __user *)*rm;
+                        srcu += (instruction & 0x000F) << 1;
+                        dst = (unsigned char *) &regs->regs[0];
+                        *(unsigned long *)dst = 0;
 
 #if !defined(__LITTLE_ENDIAN__)
                         dst += 2;
 #endif
-                        if (ma->from(dst, src, 2))
+                        if (ma->from(dst, srcu, 2))
                                 goto fetch_fault;
                         sign_extend(2, dst);
                         ret = 0;
@@ -333,7 +334,8 @@ static inline int handle_delayslot(struct pt_regs *regs,
                                    struct mem_access *ma)
 {
         opcode_t instruction;
-        void *addr = (void *)(regs->pc + instruction_size(old_instruction));
+        void __user *addr = (void __user *)(regs->pc +
+                instruction_size(old_instruction));
 
         if (copy_from_user(&instruction, addr, sizeof(instruction))) {
                 /* the instruction-fetch faulted */
@@ -559,7 +561,7 @@ asmlinkage void do_address_error(struct pt_regs *regs,
                 }
 
                 set_fs(USER_DS);
-                if (copy_from_user(&instruction, (void *)(regs->pc),
+                if (copy_from_user(&instruction, (void __user *)(regs->pc),
                                    sizeof(instruction))) {
                         /* Argh. Fault on the instruction itself.
                            This should never happen non-SMP
@@ -589,7 +591,7 @@ uspace_segv:
                         die("unaligned program counter", regs, error_code);
 
                 set_fs(KERNEL_DS);
-                if (copy_from_user(&instruction, (void *)(regs->pc),
+                if (copy_from_user(&instruction, (void __user *)(regs->pc),
                                    sizeof(instruction))) {
                         /* Argh. Fault on the instruction itself.
                            This should never happen non-SMP