Commit c78b17e2 authored Apr 11, 2016 by Daniel Lezcano Committed by Ingo Molnar Apr 13, 2016

sched/clock: Remove pointless test in cpu_clock/local_clock



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>

parent fb90a6e9

kernel/sched/clock.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -375,10 +375,7 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event);
		*/
		u64 cpu_clock(int cpu)
		{
		if (!sched_clock_stable())
		return sched_clock_cpu(cpu);

		return sched_clock();
		}

		/*
		@@ -390,10 +387,7 @@ u64 cpu_clock(int cpu)
		*/
		u64 local_clock(void)
		{
		if (!sched_clock_stable())
		return sched_clock_cpu(raw_smp_processor_id());

		return sched_clock();
		}

		#else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */

Admin message