lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched clock: simplify __update_sched_clock()

Browse Source 
- 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>
This commit is contained in:
Ingo Molnar
2008-07-30 10:15:55 +02:00
parent 18e4e36c66
commit 56b906126d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/sched_clock.c
View File

@@ -97,7 +97,7 @@ void sched_clock_init(void)
* - filter out backward motion * - filter out backward motion
* - use jiffies to generate a min,max window to clip the raw values * - 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; unsigned long now_jiffies = jiffies;
long delta_jiffies = now_jiffies - scd->tick_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->tick_jiffies = now_jiffies;
scd->clock = clock; scd->clock = clock;
return clock;
} }
static void lock_double_clock(struct sched_clock_data *data1, 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); __raw_spin_lock(&scd->lock);
} }
__update_sched_clock(scd, now); clock = __update_sched_clock(scd, now);
clock = scd->clock;
__raw_spin_unlock(&scd->lock); __raw_spin_unlock(&scd->lock);