---

yaml --- r: 116367 b: refs/heads/master c: 1508487 h: refs/heads/master i: 116365: cb3b321 116363: 0d7a377 116359: ad27ac6 116351: 639b340 v: v3
git-mirror · Sep 30, 2008 · 068d07b · 068d07b
1 parent 88e1367
commit 068d07b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7086efe1c1536f6bc160e7d60a9bfd645b91f279
+refs/heads/master: 1508487e7f16d992ad23cabd3712563ff912f413
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4042,10 +4042,12 @@ EXPORT_PER_CPU_SYMBOL(kstat);
  */
 unsigned long long task_delta_exec(struct task_struct *p)
 {
-	struct rq *rq;
 	unsigned long flags;
+	struct rq *rq;
 	u64 ns = 0;
 
+	rq = task_rq_lock(p, &flags);
+
 	if (task_current(rq, p)) {
 		u64 delta_exec;
 
@@ -4055,6 +4057,8 @@ unsigned long long task_delta_exec(struct task_struct *p)
 			ns = delta_exec;
 	}
 
+	task_rq_unlock(rq, &flags);
+
 	return ns;
 }