From 7e02418b5aefa734d61bd8b2a12089f5acffc991 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Jul 2007 13:40:43 +0200
Subject: [PATCH] --- yaml --- r: 63011 b: refs/heads/master c:
 2cd4d0ea19713304963dbb2de5073700bfe253f5 h: refs/heads/master i:   63009:
 cd6bd58604f9676c1e936e5526cbfe04bc4f7ea6   63007:
 f36d421594a1fdfdb5584429e22c05f645d196d5 v: v3

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

diff --git a/[refs] b/[refs]
index a657ec4d914f..c26419498b5f 100644
--- 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
index cc6c1192c448..3eed860cf292 100644
--- 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;
 }