[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20100409.160140.250344636.davem@davemloft.net>
Date: Fri, 09 Apr 2010 16:01:40 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: peterz@...radead.org
CC: linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org,
sparclinux@...r.kernel.org
Subject: [PATCH 3/4] sched: Use local_irq_save_nmi() in cpu_clock()
Since we can call cpu_clock() from NMI context fix up the IRQ
disabling to conform to the new rules.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Signed-off-by: David S. Miller <davem@...emloft.net>
---
kernel/sched_clock.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 5b49613..ef159ee 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -241,9 +241,9 @@ unsigned long long cpu_clock(int cpu)
unsigned long long clock;
unsigned long flags;
- local_irq_save(flags);
+ local_irq_save_nmi(flags);
clock = sched_clock_cpu(cpu);
- local_irq_restore(flags);
+ local_irq_restore_nmi(flags);
return clock;
}
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists