From 793be00d2d3a81fd593d84c32323740247b067d2 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 12 May 2008 21:21:14 +0200 Subject: [PATCH] --- yaml --- r: 100554 b: refs/heads/master c: c6531cce6e6e4b99bcda46b6268d6f2d9e30aea4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 22677f151d7c..278cec9bfb8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 677aa9f77e8de3791b481a0cec6c8b84d1eec626 +refs/heads/master: c6531cce6e6e4b99bcda46b6268d6f2d9e30aea4 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index e2e985eeee78..6590a828138f 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -884,12 +884,12 @@ static unsigned long long __cpu_clock(int cpu) * For kernel-internal use: high-speed (but slightly incorrect) per-cpu * clock constructed from sched_clock(): */ -unsigned long long cpu_clock(int cpu) +unsigned long long notrace cpu_clock(int cpu) { unsigned long long prev_cpu_time, time, delta_time; unsigned long flags; - local_irq_save(flags); + raw_local_irq_save(flags); prev_cpu_time = per_cpu(prev_cpu_time, cpu); time = __cpu_clock(cpu) + per_cpu(time_offset, cpu); delta_time = time-prev_cpu_time; @@ -898,7 +898,7 @@ unsigned long long cpu_clock(int cpu) time = __sync_cpu_clock(time, cpu); per_cpu(prev_cpu_time, cpu) = time; } - local_irq_restore(flags); + raw_local_irq_restore(flags); return time; }