Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 0 insertions, 2 deletions

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 05e09eedabff..7d1800fe7038 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -220,8 +220,6 @@ _sys_sigreturn(nabi_no_regargs 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"