---

yaml --- r: 63011 b: refs/heads/master c: 2cd4d0e h: refs/heads/master i: 63009: cd6bd58 63007: f36d421 v: v3
git-mirror · Jul 26, 2007 · 7e02418 · 7e02418
1 parent d3c9f96
commit 7e02418
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 018a2212950457b1093e504cd834aa0fe749da6c
+refs/heads/master: 2cd4d0ea19713304963dbb2de5073700bfe253f5
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -383,13 +383,12 @@ static inline unsigned long long rq_clock(struct rq *rq)
  */
 unsigned long long cpu_clock(int cpu)
 {
-	struct rq *rq = cpu_rq(cpu);
 	unsigned long long now;
 	unsigned long flags;
 
-	spin_lock_irqsave(&rq->lock, flags);
-	now = rq_clock(rq);
-	spin_unlock_irqrestore(&rq->lock, flags);
+	local_irq_save(flags);
+	now = rq_clock(cpu_rq(cpu));
+	local_irq_restore(flags);
 
 	return now;
 }