leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sched/clock: Remove pointless test in cpu_clock/local_clock

Browse Source 
In case the HAVE_UNSTABLE_SCHED_CLOCK config is set, the cpu_clock() version
checks if sched_clock_stable() is not set and calls sched_clock_cpu(),
otherwise it calls sched_clock().

sched_clock_cpu() checks also if sched_clock_stable() is set and, if true,
calls sched_clock().

sched_clock() will be called in sched_clock_cpu() if sched_clock_stable() is
true.

Remove the duplicate test by directly calling sched_clock_cpu() and let the
static key act in this function instead.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1460385514-14700-1-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Daniel Lezcano
2016-04-11 16:38:33 +02:00
committed by Ingo Molnar
parent fb90a6e93c
commit c78b17e28c
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/sched/clock.c
View File

@@ -375,10 +375,7 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event);
*/ */
u64 cpu_clock(int cpu) u64 cpu_clock(int cpu)
{ {
if (!sched_clock_stable()) return sched_clock_cpu(cpu);
return sched_clock_cpu(cpu);
return sched_clock();
} }
/* /*
@@ -390,10 +387,7 @@ u64 cpu_clock(int cpu)
*/ */
u64 local_clock(void) u64 local_clock(void)
{ {
if (!sched_clock_stable()) return sched_clock_cpu(raw_smp_processor_id());
return sched_clock_cpu(raw_smp_processor_id());
return sched_clock();
} }
#else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ #else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */