From 9ed63815e38d5eb4ffc86cb2fb0d3549b479c62e Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 9 Jun 2008 01:45:29 -0700 Subject: [PATCH] --- yaml --- r: 100573 b: refs/heads/master c: 040ec23d07f95285e9777a85cda29cb339a3065b h: refs/heads/master i: 100571: 63a6025d52dcdfe59ac8892cb7b86b9d5320557c v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1462d6091271..ed1c6bf428a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34078a5e44db3cbed2e0ed580c29a39d94e0cd97 +refs/heads/master: 040ec23d07f95285e9777a85cda29cb339a3065b diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 6590a828138f..b8c9fe676221 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -889,7 +889,7 @@ unsigned long long notrace cpu_clock(int cpu) unsigned long long prev_cpu_time, time, delta_time; unsigned long flags; - raw_local_irq_save(flags); + 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 notrace cpu_clock(int cpu) time = __sync_cpu_clock(time, cpu); per_cpu(prev_cpu_time, cpu) = time; } - raw_local_irq_restore(flags); + local_irq_restore(flags); return time; }