Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2...

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

diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 908e6368420871b04578f8321ab70fd7c509b2ec..8150f071f80afdb28da541119655369ac6686312 100644 (file)
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -279,8 +279,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"
@@ -502,8 +500,7 @@ asmlinkage int irix_sigpoll_sys(unsigned long __user *set,
        while(1) {
                long tmp = 0;
 
-               current->state = TASK_INTERRUPTIBLE;
-               expire = schedule_timeout(expire);
+               expire = schedule_timeout_interruptible(expire);
 
                for (i=0; i<=4; i++)
                        tmp |= (current->pending.signal.sig[i] & kset.sig[i]);
@@ -606,7 +603,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)
@@ -646,7 +643,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
@@ -784,8 +781,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"