diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:52:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:52:58 -0500 |
| commit | b67c26e4fcfdade157d5bd54085720e71518cccd (patch) | |
| tree | cbfcbf209abc06fc28b6c77a130985e7212879c5 /arch/mips/kernel/irixsig.c | |
| parent | c6b79418a4bb0260a92a25f562047d5be7b0e7f4 (diff) | |
| parent | 80b42598eec1627084e225c575201bdd838f5b8f (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/kernel/irixsig.c')
| -rw-r--r-- | arch/mips/kernel/irixsig.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index dd118c60bcd0..08273a2a501d 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c | |||
| @@ -279,8 +279,6 @@ irix_sigreturn(struct pt_regs *regs) | |||
| 279 | /* | 279 | /* |
| 280 | * Don't let your children do this ... | 280 | * Don't let your children do this ... |
| 281 | */ | 281 | */ |
| 282 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 283 | do_syscall_trace(regs, 1); | ||
| 284 | __asm__ __volatile__( | 282 | __asm__ __volatile__( |
| 285 | "move\t$29,%0\n\t" | 283 | "move\t$29,%0\n\t" |
| 286 | "j\tsyscall_exit" | 284 | "j\tsyscall_exit" |
| @@ -783,8 +781,6 @@ asmlinkage void irix_setcontext(struct pt_regs *regs) | |||
| 783 | /* | 781 | /* |
| 784 | * Don't let your children do this ... | 782 | * Don't let your children do this ... |
| 785 | */ | 783 | */ |
| 786 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 787 | do_syscall_trace(regs, 1); | ||
| 788 | __asm__ __volatile__( | 784 | __asm__ __volatile__( |
| 789 | "move\t$29,%0\n\t" | 785 | "move\t$29,%0\n\t" |
| 790 | "j\tsyscall_exit" | 786 | "j\tsyscall_exit" |