* [PATCH 3/4] sched: Use local_irq_save_nmi() in cpu_clock()
@ 2010-04-09 23:01 David Miller
0 siblings, 0 replies; only message in thread
From: David Miller @ 2010-04-09 23:01 UTC (permalink / raw)
To: peterz; +Cc: linux-kernel, linux-arch, sparclinux
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@chello.nl>
Signed-off-by: David S. Miller <davem@davemloft.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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-09 23:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-09 23:01 [PATCH 3/4] sched: Use local_irq_save_nmi() in cpu_clock() David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).