aboutsummaryrefslogtreecommitdiff
path: root/kernel/pid.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-10-24 10:20:57 +0200
committerIngo Molnar <mingo@kernel.org>2012-10-24 10:20:57 +0200
commitef8c029fa793423439e67ef0416b220d3fa3321a (patch)
tree4199cefa6e1dcad1783040755246a14371f029af /kernel/pid.c
parent6fcdb1ed2ef3548d5a9428d6ae60158ddd46a608 (diff)
parentc13d38e4a1fd5dd07135403c613c8091af444169 (diff)
Merge branch 'perf/urgent' into perf/core
Pick up v3.7-rc2 and fixes before applying more patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/pid.c')
-rw-r--r--kernel/pid.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/pid.c b/kernel/pid.c
index e86b291ad83..aebd4f5aaf4 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -479,6 +479,7 @@ pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns)
}
return nr;
}
+EXPORT_SYMBOL_GPL(pid_nr_ns);
pid_t pid_vnr(struct pid *pid)
{