sched/core: s/WF_ON_RQ/WQ_ON_CPU/

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

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Mel Gorman <mgorman@suse.de>
Link: https://lkml.kernel.org/r/20200622100825.785115830@infradead.org

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 60791b991b21265fc04af4260ff9074b17fe3028..f778067de277d64fd4e72e46e1ebd39501c2ce60 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -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;
 
        /*

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 1d4e94c1e5fedbb4b6f39db259540cc1eb3cbb77..877fb08eb1b046a4cc293b6293667ab25158e8d7 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -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