diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /include/linux/ptrace.h | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'include/linux/ptrace.h')
| -rw-r--r-- | include/linux/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index fd31756e1a00..ea7416c901d1 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h | |||
| @@ -172,7 +172,7 @@ static inline void ptrace_init_task(struct task_struct *child, bool ptrace) | |||
| 172 | child->ptrace = 0; | 172 | child->ptrace = 0; |
| 173 | if (unlikely(ptrace)) { | 173 | if (unlikely(ptrace)) { |
| 174 | child->ptrace = current->ptrace; | 174 | child->ptrace = current->ptrace; |
| 175 | __ptrace_link(child, current->parent); | 175 | ptrace_link(child, current->parent); |
| 176 | } | 176 | } |
| 177 | } | 177 | } |
| 178 | 178 | ||
