From 6cfa4e75bbb450b40f0a0514a1f4a458c8c26bb9 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 15 Oct 2008 22:04:25 -0700 Subject: [PATCH] --- yaml --- r: 114903 b: refs/heads/master c: 25cbe53ef1cb828ae012f3955a5aa18117114439 h: refs/heads/master i: 114901: 4df4a69980aeeca063472d8d3cbea4e83a396b68 114899: 3fa582eaff5fa901b044902554bc44f7bda8e1ec 114895: 379b10c699d9a5bef46252f45801dd2fdde5de7d v: v3 --- [refs] | 2 +- trunk/include/linux/pid_namespace.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 028292a34056..62c6479db40a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07edbde508869be63c38c5f2504bd8e8279cc535 +refs/heads/master: 25cbe53ef1cb828ae012f3955a5aa18117114439 diff --git a/trunk/include/linux/pid_namespace.h b/trunk/include/linux/pid_namespace.h index 1af82c4e17d4..d82fe825d62f 100644 --- a/trunk/include/linux/pid_namespace.h +++ b/trunk/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);