From 441f2012aeb74aee2a1b4c1d59c2317e2e0f3074 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 5 Apr 2011 17:23:56 +0200 Subject: [PATCH] --- yaml --- r: 245587 b: refs/heads/master c: 23f41eeb42ce7f6f1210904e49e84718f02cb61c h: refs/heads/master i: 245585: 2bdbd9cbb814f0e24b7f7d9a8d3b3ae898b61a7c 245583: cdad68093b4fa85c2b96a0e7b4661eb08d8894a0 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 22e6a43899f3..9b1d3a3b81c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b84cb5df1f9ad6da3f214c638d5fb08d0c99de1f +refs/heads/master: 23f41eeb42ce7f6f1210904e49e84718f02cb61c diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 5ec2e8b4b01a..e309dbad2038 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2456,8 +2456,11 @@ static void ttwu_activate(struct rq *rq, struct task_struct *p, int en_flags) wq_worker_waking_up(p, cpu_of(rq)); } +/* + * 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); @@ -2562,7 +2565,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) ttwu_activate(rq, p, ENQUEUE_WAKEUP | ENQUEUE_WAKING); out_running: - ttwu_post_activation(p, rq, wake_flags); + ttwu_do_wakeup(rq, p, wake_flags); success = 1; __task_rq_unlock(rq); @@ -2602,7 +2605,7 @@ static void try_to_wake_up_local(struct task_struct *p) if (!p->on_rq) ttwu_activate(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);