diff options
| author | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
| commit | fc457fa7c0cdbfe96812ba377e508880d600298f (patch) | |
| tree | 514049d61cf8b1587141a375ba3ec4f71e09a9db /arch/mips/kernel/signal.c | |
| parent | cc6e8de8f0fab61760bb7091fb19eef1406e17be (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge ../linus/
Diffstat (limited to 'arch/mips/kernel/signal.c')
| -rw-r--r-- | arch/mips/kernel/signal.c | 2 |
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) | |||
| 220 | /* | 220 | /* |
| 221 | * Don't let your children do this ... | 221 | * Don't let your children do this ... |
| 222 | */ | 222 | */ |
| 223 | if (current_thread_info()->flags & TIF_SYSCALL_TRACE) | ||
| 224 | do_syscall_trace(®s, 1); | ||
| 225 | __asm__ __volatile__( | 223 | __asm__ __volatile__( |
| 226 | "move\t$29, %0\n\t" | 224 | "move\t$29, %0\n\t" |
| 227 | "j\tsyscall_exit" | 225 | "j\tsyscall_exit" |