git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
include
/
linux
/
pid_namespace.h
diff --git
a/include/linux/pid_namespace.h
b/include/linux/pid_namespace.h
index d2a9d419f01f8903e12c4ab2da5e17a0d54f7481..b9a17e08ff0fa6cd24202defde59f46f31da351e 100644
(file)
--- a/
include/linux/pid_namespace.h
+++ b/
include/linux/pid_namespace.h
@@
-29,7
+29,7
@@
static inline void get_pid_ns(struct pid_namespace *ns)
kref_get(&ns->kref);
}
kref_get(&ns->kref);
}
-extern
int copy_pid_ns(int flags, struct task_struct *tsk
);
+extern
struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *ns
);
extern void free_pid_ns(struct kref *kref);
static inline void put_pid_ns(struct pid_namespace *ns)
extern void free_pid_ns(struct kref *kref);
static inline void put_pid_ns(struct pid_namespace *ns)
@@
-39,7
+39,7
@@
static inline void put_pid_ns(struct pid_namespace *ns)
static inline struct task_struct *child_reaper(struct task_struct *tsk)
{
static inline struct task_struct *child_reaper(struct task_struct *tsk)
{
- return
tsk->nsproxy->pid_ns->
child_reaper;
+ return
init_pid_ns.
child_reaper;
}
#endif /* _LINUX_PID_NS_H */
}
#endif /* _LINUX_PID_NS_H */