sched: Rename ttwu_post_activation() to ttwu_do_wakeup() (23f41eeb) · Commits · 戴 / test

kernel/sched.c

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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));		wq_worker_waking_up(p, cpu_of(rq));
	}		}

			/*
			* Mark the task runnable and perform wakeup-preemption.
			*/
	static void		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);		trace_sched_wakeup(p, true);
	check_preempt_curr(rq, p, wake_flags);		check_preempt_curr(rq, p, wake_flags);
	@@ -2562,7 +2565,7 @@ out_activate:

	ttwu_activate(rq, p, ENQUEUE_WAKEUP \| ENQUEUE_WAKING);		ttwu_activate(rq, p, ENQUEUE_WAKEUP \| ENQUEUE_WAKING);
	out_running:		out_running:
	ttwu_post_activation(p, rq, wake_flags);		ttwu_do_wakeup(rq, p, wake_flags);
	success = 1;		success = 1;
	__task_rq_unlock(rq);		__task_rq_unlock(rq);

	@@ -2602,7 +2605,7 @@ static void try_to_wake_up_local(struct task_struct *p)
	if (!p->on_rq)		if (!p->on_rq)
	ttwu_activate(rq, p, ENQUEUE_WAKEUP);		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);		ttwu_stat(p, smp_processor_id(), 0);
	out:		out:
	raw_spin_unlock(&p->pi_lock);		raw_spin_unlock(&p->pi_lock);