summaryrefslogtreecommitdiff
path: root/kernel/pid.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 04:45:50 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-11 04:45:50 +0100
commite8b722f487589a1f60ca27adc695494f188d404e (patch)
treebe3897dceb9b7c0949a8917ab11eea2752375e3b /kernel/pid.c
parent01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-e8b722f487589a1f60ca27adc695494f188d404e.tar.gz
linux-e8b722f487589a1f60ca27adc695494f188d404e.tar.bz2
linux-e8b722f487589a1f60ca27adc695494f188d404e.zip
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'kernel/pid.c')
-rw-r--r--kernel/pid.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/pid.c b/kernel/pid.c
index 064e76afa507..1b3586fe753a 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -474,8 +474,14 @@ pid_t task_session_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
}
EXPORT_SYMBOL(task_session_nr_ns);
+struct pid_namespace *task_active_pid_ns(struct task_struct *tsk)
+{
+ return ns_of_pid(task_pid(tsk));
+}
+EXPORT_SYMBOL_GPL(task_active_pid_ns);
+
/*
- * Used by proc to find the first pid that is greater then or equal to nr.
+ * Used by proc to find the first pid that is greater than or equal to nr.
*
* If there is a pid at nr this function is exactly the same as find_pid_ns.
*/