diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /include/linux/ptrace.h | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/ptrace.h')
| -rw-r--r-- | include/linux/ptrace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index ae8146abd746..3ea5750a0f7e 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h | |||
| @@ -97,6 +97,7 @@ extern void __ptrace_link(struct task_struct *child, | |||
| 97 | extern void __ptrace_unlink(struct task_struct *child); | 97 | extern void __ptrace_unlink(struct task_struct *child); |
| 98 | extern void ptrace_untrace(struct task_struct *child); | 98 | extern void ptrace_untrace(struct task_struct *child); |
| 99 | extern int ptrace_may_attach(struct task_struct *task); | 99 | extern int ptrace_may_attach(struct task_struct *task); |
| 100 | extern int __ptrace_may_attach(struct task_struct *task); | ||
| 100 | 101 | ||
| 101 | static inline void ptrace_link(struct task_struct *child, | 102 | static inline void ptrace_link(struct task_struct *child, |
| 102 | struct task_struct *new_parent) | 103 | struct task_struct *new_parent) |