diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 12:15:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 12:15:23 -0400 |
| commit | 42fea1f385e99a1db979eb75c8a53c0baad0d9f6 (patch) | |
| tree | abac6ecf700b671cd970ef3dd21d9201e79f7090 /include/linux/init_task.h | |
| parent | 7259d936c6af216198ae6af3a25ac6c9dbdbe779 (diff) | |
| parent | 666f164f4fbfa78bd00fb4b74788b42a39842c64 (diff) | |
Merge branch 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace
* 'ptrace-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace:
fix dangling zombie when new parent ignores children
do_wait: return security_task_wait() error code in place of -ECHILD
ptrace children revamp
do_wait reorganization
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 9927a88674a3..93c45acf249a 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -140,8 +140,8 @@ extern struct group_info init_groups; | |||
| 140 | .nr_cpus_allowed = NR_CPUS, \ | 140 | .nr_cpus_allowed = NR_CPUS, \ |
| 141 | }, \ | 141 | }, \ |
| 142 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ | 142 | .tasks = LIST_HEAD_INIT(tsk.tasks), \ |
| 143 | .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children), \ | 143 | .ptraced = LIST_HEAD_INIT(tsk.ptraced), \ |
| 144 | .ptrace_list = LIST_HEAD_INIT(tsk.ptrace_list), \ | 144 | .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ |
| 145 | .real_parent = &tsk, \ | 145 | .real_parent = &tsk, \ |
| 146 | .parent = &tsk, \ | 146 | .parent = &tsk, \ |
| 147 | .children = LIST_HEAD_INIT(tsk.children), \ | 147 | .children = LIST_HEAD_INIT(tsk.children), \ |