Commit 739f70b4 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Borislav Petkov
Browse files

sched/core: s/WF_ON_RQ/WQ_ON_CPU/ 



Use a better name for this poorly named flag, to avoid confusion...

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Link: https://lkml.kernel.org/r/20200622100825.785115830@infradead.org
parent b6e13e85

kernel/sched/core.c

+2 −2
Original line number Diff line number Diff line
@@ -2376,7 +2376,7 @@ static inline bool ttwu_queue_cond(int cpu, int wake_flags) 
	 * the soon-to-be-idle CPU as the current CPU is likely busy.

	 * nr_running is checked to avoid unnecessary task stacking.

	 */

	if ((wake_flags & WF_ON_RQ) && cpu_rq(cpu)->nr_running <= 1)

	if ((wake_flags & WF_ON_CPU) && cpu_rq(cpu)->nr_running <= 1)

		return true;



	return false;
@@ -2636,7 +2636,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) 
	 * scheduling.

	 */

	if (smp_load_acquire(&p->on_cpu) &&

	    ttwu_queue_wakelist(p, task_cpu(p), wake_flags | WF_ON_RQ))

	    ttwu_queue_wakelist(p, task_cpu(p), wake_flags | WF_ON_CPU))

		goto unlock;



	/*

kernel/sched/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ static inline int task_on_rq_migrating(struct task_struct *p) 
#define WF_SYNC			0x01		/* Waker goes to sleep after wakeup */

#define WF_FORK			0x02		/* Child wakeup after fork */

#define WF_MIGRATED		0x04		/* Internal use, task got migrated */

#define WF_ON_RQ		0x08		/* Wakee is on_rq */

#define WF_ON_CPU		0x08		/* Wakee is on_cpu */



/*

 * To aid in avoiding the subversion of "niceness" due to uneven distribution

CRA Git | Maintained and supported by SUSTech CRA and CCSE