diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/ia64/kernel/ptrace.c | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/ia64/kernel/ptrace.c')
| -rw-r--r-- | arch/ia64/kernel/ptrace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 3f8918782e0c..00f803246948 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c | |||
| @@ -1573,6 +1573,7 @@ sys_ptrace (long request, pid_t pid, unsigned long addr, unsigned long data) | |||
| 1573 | 1573 | ||
| 1574 | case PTRACE_DETACH: | 1574 | case PTRACE_DETACH: |
| 1575 | /* detach a process that was attached. */ | 1575 | /* detach a process that was attached. */ |
| 1576 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
| 1576 | ret = ptrace_detach(child, data); | 1577 | ret = ptrace_detach(child, data); |
| 1577 | goto out_tsk; | 1578 | goto out_tsk; |
| 1578 | 1579 | ||