diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:58:02 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:58:02 -0600 |
| commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
| tree | 470cce472be3b08c160e0c569648e7228651b12a /arch/powerpc/kernel/ptrace.c | |
| parent | ebcff3c773b42bce6182ec16485abca4e53fba97 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
| download | talos-obmc-linux-1a02e59a2970f9ed28ab51d3b08624b79e54d848.tar.gz talos-obmc-linux-1a02e59a2970f9ed28ab51d3b08624b79e54d848.zip | |
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) regs->result); if ((test_thread_flag(TIF_SYSCALL_TRACE) -#ifdef CONFIG_PPC64 - || test_thread_flag(TIF_SINGLESTEP) -#endif - ) + || test_thread_flag(TIF_SINGLESTEP)) && (current->ptrace & PT_PTRACED)) do_syscall_trace(); } |
