sched: cleanup, make dequeue_entity() and update_stats_wait_end() similar

make dequeue_entity() / enqueue_entity() and update_stats_dequeue() /
update_stats_enqueue() look similar, structure-wise.

zero effect, functionality-wise:

   text    data     bss     dec     hex filename
  34550    3026     100   37676    932c sched.o.before
  34550    3026     100   37676    932c sched.o.after

Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index d8502ec569e4bc595c3f5d99ebb70cc0aa87155c..7826e18151a8734626005e368fc2a7b047886732 100644 (file)
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -366,7 +366,6 @@ update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se)
 static inline void
 update_stats_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se)
 {
-       update_curr(cfs_rq);
        /*
         * Mark the end of the wait period if dequeueing a
         * waiting task:
@@ -505,7 +504,7 @@ static void
 enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup)
 {
        /*
-        * Update the fair clock.
+        * Update run-time statistics of the 'current'.
         */
        update_curr(cfs_rq);
 
@@ -524,6 +523,11 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup)
 static void
 dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
 {
+       /*
+        * Update run-time statistics of the 'current'.
+        */
+       update_curr(cfs_rq);
+
        update_stats_dequeue(cfs_rq, se);
        if (sleep) {
 #ifdef CONFIG_SCHEDSTATS
@@ -787,8 +791,7 @@ static void yield_task_fair(struct rq *rq)
        if (likely(!sysctl_sched_compat_yield)) {
                __update_rq_clock(rq);
                /*
-                * Dequeue and enqueue the task to update its
-                * position within the tree:
+                * Update run-time statistics of the 'current'.
                 */
                update_curr(cfs_rq);