The ttwu_post_activation() does the core wakeup, it sets TASK_RUNNING and performs wakeup-preemption, so give is a more descriptive name. Signed-off-by: Peter Zijlstra Reviewed-by: Frank Rowand --- kernel/sched.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: linux-2.6/kernel/sched.c =================================================================== --- linux-2.6.orig/kernel/sched.c +++ linux-2.6/kernel/sched.c @@ -2447,8 +2447,11 @@ ttwu_stat(struct task_struct *p, int cpu #endif /* CONFIG_SCHEDSTATS */ } +/* + * Mark the task runnable and perform wakeup-preemption. + */ static void -ttwu_post_activation(struct task_struct *p, struct rq *rq, int wake_flags) +ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags) { trace_sched_wakeup(p, true); check_preempt_curr(rq, p, wake_flags); @@ -2555,7 +2558,7 @@ try_to_wake_up(struct task_struct *p, un activate_task(rq, p, ENQUEUE_WAKEUP | ENQUEUE_WAKING); p->on_rq = 1; out_running: - ttwu_post_activation(p, rq, wake_flags); + ttwu_do_wakeup(rq, p, wake_flags); success = 1; __task_rq_unlock(rq); @@ -2592,7 +2595,7 @@ static void try_to_wake_up_local(struct if (!p->on_rq) activate_task(rq, p, ENQUEUE_WAKEUP); - ttwu_post_activation(p, rq, 0); + ttwu_do_wakeup(rq, p, 0); ttwu_stat(p, smp_processor_id(), 0); out: raw_spin_unlock(&p->pi_lock); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/