]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] sched: make cpu_clock() not use the rq clock
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Jul 2007 11:40:43 +0000 (13:40 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Jul 2007 11:40:43 +0000 (13:40 +0200)
it is enough to disable interrupts to get the precise rq-clock
of the local CPU.

this also solves an NMI watchdog regression: the NMI watchdog
calls touch_softlockup_watchdog(), which might deadlock on
rq->lock if the NMI hits an rq-locked critical section.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c

index cc6c1192c4482b248e8018384a3c703256cd86fe..3eed860cf2929d94cf47fd05b2fd8fe9da8f37a2 100644 (file)
@@ -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;
 }