---

yaml --- r: 74707 b: refs/heads/master c: 8ced5f6 h: refs/heads/master i: 74705: 648fa0c 74703: 5897c4e v: v3
git-mirror · Dec 7, 2007 · 42a583b · 42a583b
1 parent 5f2e3d6
commit 42a583b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f9fa8a62d6a98f5cb2ee2e00b85bfe95e45888d
+refs/heads/master: 8ced5f69e4bc09adcc6442e090e2e64c197246cf
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -488,7 +488,12 @@ unsigned long long cpu_clock(int cpu)
 
 	local_irq_save(flags);
 	rq = cpu_rq(cpu);
-	update_rq_clock(rq);
+	/*
+	 * Only call sched_clock() if the scheduler has already been
+	 * initialized (some code might call cpu_clock() very early):
+	 */
+	if (rq->idle)
+		update_rq_clock(rq);
 	now = rq->clock;
 	local_irq_restore(flags);