projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
include
/
linux
/
pid_namespace.h
diff --git
a/include/linux/pid_namespace.h
b/include/linux/pid_namespace.h
index
1af82c4
..
d82fe82
100644
(file)
--- a/
include/linux/pid_namespace.h
+++ b/
include/linux/pid_namespace.h
@@
-84,12
+84,6
@@
static inline struct pid_namespace *task_active_pid_ns(struct task_struct *tsk)
return tsk->nsproxy->pid_ns;
}
-static inline struct task_struct *task_child_reaper(struct task_struct *tsk)
-{
- BUG_ON(tsk != current);
- return tsk->nsproxy->pid_ns->child_reaper;
-}
-
void pidhash_init(void);
void pidmap_init(void);