aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 2567de3487bd..81345ba4b253 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1174,7 +1174,7 @@ static int wait_task_zombie(struct task_struct *p, int noreap,
1174{ 1174{
1175 unsigned long state; 1175 unsigned long state;
1176 int retval, status, traced; 1176 int retval, status, traced;
1177 pid_t pid = task_pid_nr_ns(p, current->nsproxy->pid_ns); 1177 pid_t pid = task_pid_vnr(p);
1178 1178
1179 if (unlikely(noreap)) { 1179 if (unlikely(noreap)) {
1180 uid_t uid = p->uid; 1180 uid_t uid = p->uid;
@@ -1369,7 +1369,7 @@ unlock_sig:
1369 * possibly take page faults for user memory. 1369 * possibly take page faults for user memory.
1370 */ 1370 */
1371 get_task_struct(p); 1371 get_task_struct(p);
1372 pid = task_pid_nr_ns(p, current->nsproxy->pid_ns); 1372 pid = task_pid_vnr(p);
1373 why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; 1373 why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED;
1374 read_unlock(&tasklist_lock); 1374 read_unlock(&tasklist_lock);
1375 1375
@@ -1428,7 +1428,7 @@ static int wait_task_continued(struct task_struct *p, int noreap,
1428 p->signal->flags &= ~SIGNAL_STOP_CONTINUED; 1428 p->signal->flags &= ~SIGNAL_STOP_CONTINUED;
1429 spin_unlock_irq(&p->sighand->siglock); 1429 spin_unlock_irq(&p->sighand->siglock);
1430 1430
1431 pid = task_pid_nr_ns(p, current->nsproxy->pid_ns); 1431 pid = task_pid_vnr(p);
1432 uid = p->uid; 1432 uid = p->uid;
1433 get_task_struct(p); 1433 get_task_struct(p);
1434 read_unlock(&tasklist_lock); 1434 read_unlock(&tasklist_lock);