commit 1508487e7f16d992ad23cabd3712563ff912f413
author Ingo Molnar <mingo@elte.hu> Tue Sep 30 08:28:17 2008 +0200
committer Ingo Molnar <mingo@elte.hu> Tue Sep 30 08:28:17 2008 +0200
tree d8e341de10ec868c4f8d4129aa04eadd33f37ca9
parent 7086efe1c1536f6bc160e7d60a9bfd645b91f279

timers: fix itimer/many thread hang, fix

fix bogus rq dereference: v3 removed the locking but also removed the rq
initialization.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 29a3152..ebb03de 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4042,10 +4042,12 @@
  */
 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 @@
 			ns = delta_exec;
 	}
 
+	task_rq_unlock(rq, &flags);
+
 	return ns;
 }