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/signal32.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/signal32.c')
| -rw-r--r-- | arch/mips/kernel/signal32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index e315d3f6aa6e..c856dbc52abb 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c | |||
| @@ -497,8 +497,6 @@ _sys32_sigreturn(nabi_no_regargs struct pt_regs regs) | |||
| 497 | /* | 497 | /* |
| 498 | * Don't let your children do this ... | 498 | * Don't let your children do this ... |
| 499 | */ | 499 | */ |
| 500 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 501 | do_syscall_trace(®s, 1); | ||
| 502 | __asm__ __volatile__( | 500 | __asm__ __volatile__( |
| 503 | "move\t$29, %0\n\t" | 501 | "move\t$29, %0\n\t" |
| 504 | "j\tsyscall_exit" | 502 | "j\tsyscall_exit" |