From 583934b6ab329c488b350db1cf5cf191720b0d06 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 7 Jan 2008 14:22:44 -0800 Subject: [PATCH] --- yaml --- r: 75291 b: refs/heads/master c: 45626bb26a6ecd163e5eeddd14a6137052ec4495 h: refs/heads/master i: 75289: 44478a7d61fd1eb8c3970ff62de262b035ce5224 75287: 60191dd3fbc6e2d168c2739e5ffe309f962c3b93 v: v3 --- [refs] | 2 +- trunk/fs/binfmt_elf.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 50b97ef8941a..27bf57a7255b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4c6d3c6b14bd20fb8087acd51b29ee54a66ef77 +refs/heads/master: 45626bb26a6ecd163e5eeddd14a6137052ec4495 diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index ba8de7ca260b..f0b3171842f2 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -1384,7 +1384,7 @@ static void fill_prstatus(struct elf_prstatus *prstatus, prstatus->pr_sigpend = p->pending.signal.sig[0]; prstatus->pr_sighold = p->blocked.sig[0]; prstatus->pr_pid = task_pid_vnr(p); - prstatus->pr_ppid = task_pid_vnr(p->parent); + prstatus->pr_ppid = task_pid_vnr(p->real_parent); prstatus->pr_pgrp = task_pgrp_vnr(p); prstatus->pr_sid = task_session_vnr(p); if (thread_group_leader(p)) { @@ -1430,7 +1430,7 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p, psinfo->pr_psargs[len] = 0; psinfo->pr_pid = task_pid_vnr(p); - psinfo->pr_ppid = task_pid_vnr(p->parent); + psinfo->pr_ppid = task_pid_vnr(p->real_parent); psinfo->pr_pgrp = task_pgrp_vnr(p); psinfo->pr_sid = task_session_vnr(p);