aboutsummaryrefslogtreecommitdiff
path: root/kernel/sched_clock.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-29 15:01:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-29 15:05:00 +0200
commit2d452c9b10caeec455eb5e56a0ef4ed485178213 (patch)
tree8c7af10fa4b2f69307a1b4e0a997ed9d4e2ed32d /kernel/sched_clock.c
parent4c9fe8ad813b257a2b9ddf0f752105a75a7dae63 (diff)
downloadlinux-stericsson-2d452c9b10caeec455eb5e56a0ef4ed485178213.tar.gz
sched: sched_clock_cpu() based cpu_clock(), lockdep fix
Vegard Nossum reported: > WARNING: at kernel/lockdep.c:2738 check_flags+0x142/0x160() which happens due to: unsigned long long cpu_clock(int cpu) { unsigned long long clock; unsigned long flags; raw_local_irq_save(flags); as lower level functions can take locks, we must not do that, use proper lockdep-annotated irq save/restore. Reported-by: Vegard Nossum <vegard.nossum@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_clock.c')
-rw-r--r--kernel/sched_clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index ed5a8c415046..60094e257a9a 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -250,9 +250,9 @@ unsigned long long cpu_clock(int cpu)
unsigned long long clock;
unsigned long flags;
- raw_local_irq_save(flags);
+ local_irq_save(flags);
clock = sched_clock_cpu(cpu);
- raw_local_irq_restore(flags);
+ local_irq_restore(flags);
return clock;
}