The patch titled do_wait() wakeup optimization: shift security_task_wait() from eligible_child() to wait_consider_task() has been removed from the -mm tree. Its filename was do_wait-wakeup-optimization-shift-security_task_wait-from-eligible_child-to-wait_consider_task.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: do_wait() wakeup optimization: shift security_task_wait() from eligible_child() to wait_consider_task() From: Oleg Nesterov <oleg@xxxxxxxxxx> Preparation, no functional changes. eligible_child() has a single caller, wait_consider_task(). We can move security_task_wait() out from eligible_child(), this allows us to use it for filtered wake_up(). Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx> Acked-by: Roland McGrath <roland@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Ratan Nalumasu <rnalumasu@xxxxxxxxx> Cc: Vitaly Mayatskikh <vmayatsk@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/exit.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff -puN kernel/exit.c~do_wait-wakeup-optimization-shift-security_task_wait-from-eligible_child-to-wait_consider_task kernel/exit.c --- a/kernel/exit.c~do_wait-wakeup-optimization-shift-security_task_wait-from-eligible_child-to-wait_consider_task +++ a/kernel/exit.c @@ -1112,8 +1112,6 @@ static struct pid *task_pid_type(struct static int eligible_child(struct wait_opts *wo, struct task_struct *p) { - int err; - if (wo->wo_type < PIDTYPE_MAX) { if (task_pid_type(p, wo->wo_type) != wo->wo_pid) return 0; @@ -1128,10 +1126,6 @@ static int eligible_child(struct wait_op && !(wo->wo_flags & __WALL)) return 0; - err = security_task_wait(p); - if (err) - return err; - return 1; } @@ -1492,6 +1486,7 @@ static int wait_consider_task(struct wai if (!ret) return ret; + ret = security_task_wait(p); if (unlikely(ret < 0)) { /* * If we have not yet seen any eligible child, _ Patches currently in -mm which might be from oleg@xxxxxxxxxx are origin.patch linux-next.patch do_wait-optimization-do-not-place-sub-threads-on-task_struct-children-list.patch utrace-core.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html