forked from luck/tmp_suning_uos_patched
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
This commit is contained in:
parent
b84cb5df1f
commit
23f41eeb42
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user