aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-04-05 11:23:56 -0400
committerIngo Molnar <mingo@elte.hu>2011-04-14 02:52:40 -0400
commit23f41eeb42ce7f6f1210904e49e84718f02cb61c (patch)
tree7273b47e0e33bfe9188abea3a7dd9f5514f720b5
parentb84cb5df1f9ad6da3f214c638d5fb08d0c99de1f (diff)
sched: Rename ttwu_post_activation() to ttwu_do_wakeup()
The ttwu_post_activation() code does the core wakeup, it sets TASK_RUNNING and performs wakeup-preemption, so give is a more descriptive name. Reviewed-by: Frank Rowand <frank.rowand@am.sony.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Nick Piggin <npiggin@kernel.dk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20110405152729.434609705@chello.nl
-rw-r--r--kernel/sched.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 5ec2e8b4b01a..e309dbad2038 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2456,8 +2456,11 @@ static void ttwu_activate(struct rq *rq, struct task_struct *p, int en_flags)
2456 wq_worker_waking_up(p, cpu_of(rq)); 2456 wq_worker_waking_up(p, cpu_of(rq));
2457} 2457}
2458 2458
2459/*
2460 * Mark the task runnable and perform wakeup-preemption.
2461 */
2459static void 2462static void
2460ttwu_post_activation(struct task_struct *p, struct rq *rq, int wake_flags) 2463ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags)
2461{ 2464{
2462 trace_sched_wakeup(p, true); 2465 trace_sched_wakeup(p, true);
2463 check_preempt_curr(rq, p, wake_flags); 2466 check_preempt_curr(rq, p, wake_flags);
@@ -2562,7 +2565,7 @@ out_activate:
2562 2565
2563 ttwu_activate(rq, p, ENQUEUE_WAKEUP | ENQUEUE_WAKING); 2566 ttwu_activate(rq, p, ENQUEUE_WAKEUP | ENQUEUE_WAKING);
2564out_running: 2567out_running:
2565 ttwu_post_activation(p, rq, wake_flags); 2568 ttwu_do_wakeup(rq, p, wake_flags);
2566 success = 1; 2569 success = 1;
2567 __task_rq_unlock(rq); 2570 __task_rq_unlock(rq);
2568 2571
@@ -2602,7 +2605,7 @@ static void try_to_wake_up_local(struct task_struct *p)
2602 if (!p->on_rq) 2605 if (!p->on_rq)
2603 ttwu_activate(rq, p, ENQUEUE_WAKEUP); 2606 ttwu_activate(rq, p, ENQUEUE_WAKEUP);
2604 2607
2605 ttwu_post_activation(p, rq, 0); 2608 ttwu_do_wakeup(rq, p, 0);
2606 ttwu_stat(p, smp_processor_id(), 0); 2609 ttwu_stat(p, smp_processor_id(), 0);
2607out: 2610out:
2608 raw_spin_unlock(&p->pi_lock); 2611 raw_spin_unlock(&p->pi_lock);