diff --git a/[refs] b/[refs] index 70d09abd5db9..21b2eade1a4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2e0d98705e60e45bbb3c0032c48824ad7ae0704 +refs/heads/master: e9f238c3041e2582a710e75910c8cbf2a98e51b2 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index c1c207c36cae..554434265613 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -162,7 +162,7 @@ static inline const char *get_task_state(struct task_struct *tsk) static inline void task_state(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *p) { - struct user_namespace *user_ns = current_user_ns(); + struct user_namespace *user_ns = seq_user_ns(m); struct group_info *group_info; int g; struct fdtable *fdt = NULL;