This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / mm / fault.c

diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c
index 57d9930..2a4029c 100644 (file)
--- a/arch/ppc/mm/fault.c
+++ b/arch/ppc/mm/fault.c
@@ -59,7 +59,7 @@ static int store_updates_sp(struct pt_regs *regs)
 {
        unsigned int inst;
 
-       if (get_user(inst, (unsigned int __user *)regs->nip))
+       if (get_user(inst, (unsigned int *)regs->nip))
                return 0;
        /* check for 1 in the rA field */
        if (((inst >> 16) & 0x1f) != 1)
@@ -281,7 +281,7 @@ bad_area:
                info.si_signo = SIGSEGV;
                info.si_errno = 0;
                info.si_code = code;
-               info.si_addr = (void __user *) address;
+               info.si_addr = (void *) address;
                force_sig_info(SIGSEGV, &info, current);
                return 0;
        }
@@ -309,7 +309,7 @@ do_sigbus:
        info.si_signo = SIGBUS;
        info.si_errno = 0;
        info.si_code = BUS_ADRERR;
-       info.si_addr = (void __user *)address;
+       info.si_addr = (void *)address;
        force_sig_info (SIGBUS, &info, current);
        if (!user_mode(regs))
                return SIGBUS;