diff --git a/[refs] b/[refs] index 34f51e70d8d2..1634a4b1622e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fd3670eb1d3c33e8952cf1e79edbb2d517dcfb5 +refs/heads/master: a98fdcef941e107eeabae622d85a1f476f25a160 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 810eb8fd6500..eb97f2897e2b 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -426,7 +426,6 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) cgtime = gtime = cputime_zero; rcu_read_lock(); - ppid = task_tgid_nr_ns(task->real_parent, ns); if (lock_task_sighand(task, &flags)) { struct signal_struct *sig = task->signal; @@ -465,6 +464,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) } sid = task_session_nr_ns(task, ns); + ppid = task_tgid_nr_ns(task->real_parent, ns); pgid = task_pgrp_nr_ns(task, ns); unlock_task_sighand(task, &flags);