Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / arch / mips / kernel / irixsig.c

diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index dd118c60bcd0676f69c6a841de91cf4f7ee96a23..676e868d26fb15ab79b23d7c69be792276185be8 100644 (file)
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -13,6 +13,7 @@
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/ptrace.h>
+#include <linux/resource.h>
 
 #include <asm/ptrace.h>
 #include <asm/uaccess.h>
@@ -260,7 +261,7 @@ irix_sigreturn(struct pt_regs *regs)
 
                for(i = 0; i < 32; i++)
                        error |= __get_user(fregs[i], &context->fpregs[i]);
-               error |= __get_user(current->thread.fpu.hard.fcr31, &context->fpcsr);
+               error |= __get_user(current->thread.fpu.fcr31, &context->fpcsr);
        }
 
        /* XXX do sigstack crapola here... XXX */
@@ -279,8 +280,6 @@ irix_sigreturn(struct pt_regs *regs)
        /*
         * Don't let your children do this ...
         */
-       if (current_thread_info()->flags & TIF_SYSCALL_TRACE)
-               do_syscall_trace(regs, 1);
        __asm__ __volatile__(
                "move\t$29,%0\n\t"
                "j\tsyscall_exit"
@@ -542,8 +541,6 @@ out:
 #define IRIX_P_PGID   2
 #define IRIX_P_ALL    7
 
-extern int getrusage(struct task_struct *, int, struct rusage __user *);
-
 #define W_EXITED     1
 #define W_TRAPPED    2
 #define W_STOPPED    4
@@ -605,7 +602,7 @@ repeat:
                        /* move to end of parent's list to avoid starvation */
                        write_lock_irq(&tasklist_lock);
                        remove_parent(p);
-                       add_parent(p, p->parent);
+                       add_parent(p);
                        write_unlock_irq(&tasklist_lock);
                        retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
                        if (retval)
@@ -645,7 +642,7 @@ repeat:
                                write_lock_irq(&tasklist_lock);
                                remove_parent(p);
                                p->parent = p->real_parent;
-                               add_parent(p, p->parent);
+                               add_parent(p);
                                do_notify_parent(p, SIGCHLD);
                                write_unlock_irq(&tasklist_lock);
                        } else
@@ -783,8 +780,6 @@ asmlinkage void irix_setcontext(struct pt_regs *regs)
        /*
         * Don't let your children do this ...
         */
-       if (current_thread_info()->flags & TIF_SYSCALL_TRACE)
-               do_syscall_trace(regs, 1);
        __asm__ __volatile__(
                "move\t$29,%0\n\t"
                "j\tsyscall_exit"