diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /include/linux/pid_namespace.h | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/pid_namespace.h')
| -rw-r--r-- | include/linux/pid_namespace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index d2a9d419f01f..2833806d42c6 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h | |||
| @@ -39,7 +39,7 @@ static inline void put_pid_ns(struct pid_namespace *ns) | |||
| 39 | 39 | ||
| 40 | static inline struct task_struct *child_reaper(struct task_struct *tsk) | 40 | static inline struct task_struct *child_reaper(struct task_struct *tsk) |
| 41 | { | 41 | { |
| 42 | return tsk->nsproxy->pid_ns->child_reaper; | 42 | return init_pid_ns.child_reaper; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | #endif /* _LINUX_PID_NS_H */ | 45 | #endif /* _LINUX_PID_NS_H */ |