From 94ef5ec7cdeabd9ad4a744044123ef36b3cd48c9 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 30 Jul 2008 10:15:55 +0200 Subject: [PATCH] --- yaml --- r: 108209 b: refs/heads/master c: 56b906126d33904d4d67615d0d5b95dbdf1f27ca h: refs/heads/master i: 108207: d6b1589fb89553618d5b41923a3ac466f2167160 v: v3 --- [refs] | 2 +- trunk/kernel/sched_clock.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9780a5cb5e3d..f05f27aa2bf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18e4e36c66d6edbdefc639692206cdf01e468713 +refs/heads/master: 56b906126d33904d4d67615d0d5b95dbdf1f27ca diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c index 4b8474c966dc..857a1291fd23 100644 --- a/trunk/kernel/sched_clock.c +++ b/trunk/kernel/sched_clock.c @@ -97,7 +97,7 @@ void sched_clock_init(void) * - filter out backward motion * - use jiffies to generate a min,max window to clip the raw values */ -static void __update_sched_clock(struct sched_clock_data *scd, u64 now) +static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now) { unsigned long now_jiffies = jiffies; long delta_jiffies = now_jiffies - scd->tick_jiffies; @@ -130,6 +130,8 @@ static void __update_sched_clock(struct sched_clock_data *scd, u64 now) scd->tick_jiffies = now_jiffies; scd->clock = clock; + + return clock; } static void lock_double_clock(struct sched_clock_data *data1, @@ -174,8 +176,7 @@ u64 sched_clock_cpu(int cpu) __raw_spin_lock(&scd->lock); } - __update_sched_clock(scd, now); - clock = scd->clock; + clock = __update_sched_clock(scd, now); __raw_spin_unlock(&scd->lock);