From d5683ed08de5f0037c8d9ac3e17e2be705320b6c Mon Sep 17 00:00:00 2001
From: Mike Galbraith <mgalbraith@suse.de>
Date: Sat, 4 Aug 2012 05:44:14 +0200
Subject: [PATCH] --- yaml --- r: 321835 b: refs/heads/master c:
 8f6189684eb4e85e6c593cd710693f09c944450a h: refs/heads/master i:   321833:
 7d709b1ce6636232267423acd18e2db4bedd04a2   321831:
 2fbcd29585811a2c045f769f5f0265b9fa800943 v: v3

---
 [refs]                         |  2 +-
 trunk/kernel/sched/stop_task.c | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 839b11da7d38..8e546e285599 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e221d028bb08b47e624c5f0a31732c642db9d19a
+refs/heads/master: 8f6189684eb4e85e6c593cd710693f09c944450a
diff --git a/trunk/kernel/sched/stop_task.c b/trunk/kernel/sched/stop_task.c
index 7b386e86fd23..da5eb5bed84a 100644
--- a/trunk/kernel/sched/stop_task.c
+++ b/trunk/kernel/sched/stop_task.c
@@ -27,8 +27,10 @@ static struct task_struct *pick_next_task_stop(struct rq *rq)
 {
 	struct task_struct *stop = rq->stop;
 
-	if (stop && stop->on_rq)
+	if (stop && stop->on_rq) {
+		stop->se.exec_start = rq->clock_task;
 		return stop;
+	}
 
 	return NULL;
 }
@@ -52,6 +54,21 @@ static void yield_task_stop(struct rq *rq)
 
 static void put_prev_task_stop(struct rq *rq, struct task_struct *prev)
 {
+	struct task_struct *curr = rq->curr;
+	u64 delta_exec;
+
+	delta_exec = rq->clock_task - curr->se.exec_start;
+	if (unlikely((s64)delta_exec < 0))
+		delta_exec = 0;
+
+	schedstat_set(curr->se.statistics.exec_max,
+			max(curr->se.statistics.exec_max, delta_exec));
+
+	curr->se.sum_exec_runtime += delta_exec;
+	account_group_exec_runtime(curr, delta_exec);
+
+	curr->se.exec_start = rq->clock_task;
+	cpuacct_charge(curr, delta_exec);
 }
 
 static void task_tick_stop(struct rq *rq, struct task_struct *curr, int queued)
@@ -60,6 +77,9 @@ static void task_tick_stop(struct rq *rq, struct task_struct *curr, int queued)
 
 static void set_curr_task_stop(struct rq *rq)
 {
+	struct task_struct *stop = rq->stop;
+
+	stop->se.exec_start = rq->clock_task;
 }
 
 static void switched_to_stop(struct rq *rq, struct task_struct *p)