Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6e763f0 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

wait_consider_task: kill "parent" argument 



Kill the unused "parent" argument in wait_consider_task(), it was never used.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Ratan Nalumasu <rnalumasu@gmail.com>
Cc: Vitaly Mayatskikh <vmayatsk@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 989264f4

kernel/exit.c

+4 −4
Original line number Diff line number Diff line
@@ -1481,8 +1481,8 @@ static int wait_task_continued(struct wait_opts *wo, struct task_struct *p) 
 * then ->notask_error is 0 if @p is an eligible child,

 * or another error from security_task_wait(), or still -ECHILD.

 */

static int wait_consider_task(struct wait_opts *wo, struct task_struct *parent,

				int ptrace, struct task_struct *p)

static int wait_consider_task(struct wait_opts *wo, int ptrace,

				struct task_struct *p)

{

	int ret = eligible_child(wo, p);

	if (!ret)
@@ -1550,7 +1550,7 @@ static int do_wait_thread(struct wait_opts *wo, struct task_struct *tsk) 
		 * Do not consider detached threads.

		 */

		if (!task_detached(p)) {

			int ret = wait_consider_task(wo, tsk, 0, p);

			int ret = wait_consider_task(wo, 0, p);

			if (ret)

				return ret;

		}
@@ -1564,7 +1564,7 @@ static int ptrace_do_wait(struct wait_opts *wo, struct task_struct *tsk) 
	struct task_struct *p;



	list_for_each_entry(p, &tsk->ptraced, ptrace_entry) {

		int ret = wait_consider_task(wo, tsk, 1, p);

		int ret = wait_consider_task(wo, 1, p);

		if (ret)

			return ret;

	}