aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched_clock.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-30 04:15:55 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-31 11:20:55 -0400
commit56b906126d33904d4d67615d0d5b95dbdf1f27ca (patch)
tree49ff0678cbb0f388fc5fd42e71ec5916fd655193 /kernel/sched_clock.c
parent18e4e36c66d6edbdefc639692206cdf01e468713 (diff)
sched clock: simplify __update_sched_clock()
- return the current clock instead of letting callers fetch it from scd->clock Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Mike Galbraith <efault@gmx.de>
Diffstat (limited to 'kernel/sched_clock.c')
-rw-r--r--kernel/sched_clock.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 4b8474c966dc..857a1291fd23 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -97,7 +97,7 @@ void sched_clock_init(void)
97 * - filter out backward motion 97 * - filter out backward motion
98 * - use jiffies to generate a min,max window to clip the raw values 98 * - use jiffies to generate a min,max window to clip the raw values
99 */ 99 */
100static void __update_sched_clock(struct sched_clock_data *scd, u64 now) 100static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now)
101{ 101{
102 unsigned long now_jiffies = jiffies; 102 unsigned long now_jiffies = jiffies;
103 long delta_jiffies = now_jiffies - scd->tick_jiffies; 103 long delta_jiffies = now_jiffies - scd->tick_jiffies;
@@ -130,6 +130,8 @@ static void __update_sched_clock(struct sched_clock_data *scd, u64 now)
130 130
131 scd->tick_jiffies = now_jiffies; 131 scd->tick_jiffies = now_jiffies;
132 scd->clock = clock; 132 scd->clock = clock;
133
134 return clock;
133} 135}
134 136
135static void lock_double_clock(struct sched_clock_data *data1, 137static void lock_double_clock(struct sched_clock_data *data1,
@@ -174,8 +176,7 @@ u64 sched_clock_cpu(int cpu)
174 __raw_spin_lock(&scd->lock); 176 __raw_spin_lock(&scd->lock);
175 } 177 }
176 178
177 __update_sched_clock(scd, now); 179 clock = __update_sched_clock(scd, now);
178 clock = scd->clock;
179 180
180 __raw_spin_unlock(&scd->lock); 181 __raw_spin_unlock(&scd->lock);
181 182