1 files changed, 10 insertions, 3 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 2f16e15c022c..c33f0ceb3de9 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -351,6 +351,12 @@ static void update_curr(struct cfs_rq *cfs_rq)
 
         __update_curr(cfs_rq, curr, delta_exec);
         curr->exec_start = now;
+
+        if (entity_is_task(curr)) {
+                struct task_struct *curtask = task_of(curr);
+
+                cpuacct_charge(curtask, delta_exec);
+        }
 }
 
 static inline void
@@ -793,8 +799,9 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep)
  */
 static void yield_task_fair(struct rq *rq)
 {
-        struct cfs_rq *cfs_rq = task_cfs_rq(rq->curr);
-        struct sched_entity *rightmost, *se = &rq->curr->se;
+        struct task_struct *curr = rq->curr;
+        struct cfs_rq *cfs_rq = task_cfs_rq(curr);
+        struct sched_entity *rightmost, *se = &curr->se;
 
         /*
          * Are we the only task in the tree?
@@ -802,7 +809,7 @@ static void yield_task_fair(struct rq *rq)
         if (unlikely(cfs_rq->nr_running == 1))
                 return;
 
-        if (likely(!sysctl_sched_compat_yield)) {
+        if (likely(!sysctl_sched_compat_yield) && curr->policy != SCHED_BATCH) {
                 __update_rq_clock(rq);
                 /*
                  * Update run-time statistics of the 'current'.