Re-enable "optimization" check for all task in cfs rq

 - remove "likely" condition from branch
 - add litmus.nr_running counter

1 files changed, 4 insertions, 0 deletions

diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 557563785162..9da589e4e41c 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -139,6 +139,8 @@ static void enqueue_task_litmus(struct rq *rq, struct task_struct *p,
                 sched_trace_task_resume(p);
                 tsk_rt(p)->present = 1;
                 litmus->task_wake_up(p);
+
+                rq->litmus.nr_running++;
         } else
                 TRACE_TASK(p, "ignoring an enqueue, not a wake up.\n");
 }
@@ -149,6 +151,8 @@ static void dequeue_task_litmus(struct rq *rq, struct task_struct *p, int sleep)
                 litmus->task_block(p);
                 tsk_rt(p)->present = 0;
                 sched_trace_task_block(p);
+
+                rq->litmus.nr_running--;
         } else
                 TRACE_TASK(p, "ignoring a dequeue, not going to sleep.\n");
 }