Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / include / linux / pid_namespace.h

diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index 76e7c6b..169c6c2 100644 (file)
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -19,6 +19,7 @@ struct pid_namespace {
        struct kref kref;
        struct pidmap pidmap[PIDMAP_ENTRIES];
        int last_pid;
+       struct task_struct *child_reaper;
 };
 
 extern struct pid_namespace init_pid_ns;
@@ -28,7 +29,7 @@ static inline void get_pid_ns(struct pid_namespace *ns)
        kref_get(&ns->kref);
 }
 
-extern int copy_pid_ns(int flags, struct task_struct *tsk);
+extern struct pid_namespace *copy_pid_ns(int flags, struct pid_namespace *ns);
 extern void free_pid_ns(struct kref *kref);
 
 static inline void put_pid_ns(struct pid_namespace *ns)
@@ -36,4 +37,9 @@ static inline void put_pid_ns(struct pid_namespace *ns)
        kref_put(&ns->kref, free_pid_ns);
 }
 
+static inline struct task_struct *child_reaper(struct task_struct *tsk)
+{
+       return init_pid_ns.child_reaper;
+}
+
 #endif /* _LINUX_PID_NS_H */