diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/powerpc/kernel/ptrace.c | |
| parent | 9585da3729e7e27bf22818625c10ac6c64ebb609 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/kernel/ptrace.c')
| -rw-r--r-- | arch/powerpc/kernel/ptrace.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 400793c71304..bcb83574335b 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c | |||
| @@ -561,10 +561,7 @@ void do_syscall_trace_leave(struct pt_regs *regs) | |||
| 561 | regs->result); | 561 | regs->result); |
| 562 | 562 | ||
| 563 | if ((test_thread_flag(TIF_SYSCALL_TRACE) | 563 | if ((test_thread_flag(TIF_SYSCALL_TRACE) |
| 564 | #ifdef CONFIG_PPC64 | 564 | || test_thread_flag(TIF_SINGLESTEP)) |
| 565 | || test_thread_flag(TIF_SINGLESTEP) | ||
| 566 | #endif | ||
| 567 | ) | ||
| 568 | && (current->ptrace & PT_PTRACED)) | 565 | && (current->ptrace & PT_PTRACED)) |
| 569 | do_syscall_trace(); | 566 | do_syscall_trace(); |
| 570 | } | 567 | } |