sched: Re-arrange the {EN,DE}QUEUE flags

Ensure the matched flags are in the low word while the unmatched flags
go into the second word.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Juri Lelli <juri.lelli@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Vincent Guittot <vincent.guittot@linaro.org>

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 6546849aa075f2ea9f54b33501b66e995751f43a..24b3c6c9ca63aa0752f4a0db400ae4359b46041d 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -2362,27 +2362,30 @@ extern const u32                sched_prio_to_wmult[40];
  *
  */
 
-#define DEQUEUE_SLEEP          0x01 /* Matches ENQUEUE_WAKEUP */
-#define DEQUEUE_SAVE           0x02 /* Matches ENQUEUE_RESTORE */
-#define DEQUEUE_MOVE           0x04 /* Matches ENQUEUE_MOVE */
-#define DEQUEUE_NOCLOCK                0x08 /* Matches ENQUEUE_NOCLOCK */
-#define DEQUEUE_SPECIAL                0x10
-#define DEQUEUE_MIGRATING      0x100 /* Matches ENQUEUE_MIGRATING */
-#define DEQUEUE_DELAYED                0x200 /* Matches ENQUEUE_DELAYED */
-#define DEQUEUE_THROTTLE       0x800
-
-#define ENQUEUE_WAKEUP         0x01
-#define ENQUEUE_RESTORE                0x02
-#define ENQUEUE_MOVE           0x04
-#define ENQUEUE_NOCLOCK                0x08
-
-#define ENQUEUE_HEAD           0x10
-#define ENQUEUE_REPLENISH      0x20
-#define ENQUEUE_MIGRATED       0x40
-#define ENQUEUE_INITIAL                0x80
-#define ENQUEUE_MIGRATING      0x100
-#define ENQUEUE_DELAYED                0x200
-#define ENQUEUE_RQ_SELECTED    0x400
+#define DEQUEUE_SLEEP          0x0001 /* Matches ENQUEUE_WAKEUP */
+#define DEQUEUE_SAVE           0x0002 /* Matches ENQUEUE_RESTORE */
+#define DEQUEUE_MOVE           0x0004 /* Matches ENQUEUE_MOVE */
+#define DEQUEUE_NOCLOCK                0x0008 /* Matches ENQUEUE_NOCLOCK */
+
+#define DEQUEUE_MIGRATING      0x0010 /* Matches ENQUEUE_MIGRATING */
+#define DEQUEUE_DELAYED                0x0020 /* Matches ENQUEUE_DELAYED */
+
+#define DEQUEUE_SPECIAL                0x00010000
+#define DEQUEUE_THROTTLE       0x00020000
+
+#define ENQUEUE_WAKEUP         0x0001
+#define ENQUEUE_RESTORE                0x0002
+#define ENQUEUE_MOVE           0x0004
+#define ENQUEUE_NOCLOCK                0x0008
+
+#define ENQUEUE_MIGRATING      0x0010
+#define ENQUEUE_DELAYED                0x0020
+
+#define ENQUEUE_HEAD           0x00010000
+#define ENQUEUE_REPLENISH      0x00020000
+#define ENQUEUE_MIGRATED       0x00040000
+#define ENQUEUE_INITIAL                0x00080000
+#define ENQUEUE_RQ_SELECTED    0x00100000
 
 #define RETRY_TASK             ((void *)-1UL)