---

yaml --- r: 139709 b: refs/heads/master c: 2ae448e h: refs/heads/master i: 139707: 904ee6f v: v3
git-mirror · Apr 3, 2009 · 1e47814 · 1e47814
1 parent b4ad27a
commit 1e47814
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dda81f4384b94930826eded254d8c16f89a9248
+refs/heads/master: 2ae448efc87df6d328f5835969076c7f9fce59c3
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
@@ -1737,7 +1737,7 @@ SYSCALL_DEFINE4(wait4, pid_t, upid, int __user *, stat_addr,
 		pid = find_get_pid(-upid);
 	} else if (upid == 0) {
 		type = PIDTYPE_PGID;
-		pid = get_pid(task_pgrp(current));
+		pid = get_task_pid(current, PIDTYPE_PGID);
 	} else /* upid > 0 */ {
 		type = PIDTYPE_PID;
 		pid = find_get_pid(upid);

diff --git a/trunk/kernel/pid.c b/trunk/kernel/pid.c
@@ -403,6 +403,8 @@ struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
 {
 	struct pid *pid;
 	rcu_read_lock();
+	if (type != PIDTYPE_PID)
+		task = task->group_leader;
 	pid = get_pid(task->pids[type].pid);
 	rcu_read_unlock();
 	return pid;