From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934182AbcDMLtC (ORCPT ); Wed, 13 Apr 2016 07:49:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57206 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759572AbcDMLs7 (ORCPT ); Wed, 13 Apr 2016 07:48:59 -0400 Date: Wed, 13 Apr 2016 04:48:25 -0700 From: tip-bot for Daniel Lezcano Message-ID: Cc: torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, daniel.lezcano@linaro.org, hpa@zytor.com, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, peterz@infradead.org, hpa@zytor.com, daniel.lezcano@linaro.org, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <1460385514-14700-1-git-send-email-daniel.lezcano@linaro.org> References: <1460385514-14700-1-git-send-email-daniel.lezcano@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/clock: Remove pointless test in cpu_clock/local_clock Git-Commit-ID: c78b17e28cc2c2df74264afc408bdc6aaf3fbcc8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c78b17e28cc2c2df74264afc408bdc6aaf3fbcc8 Gitweb: http://git.kernel.org/tip/c78b17e28cc2c2df74264afc408bdc6aaf3fbcc8 Author: Daniel Lezcano AuthorDate: Mon, 11 Apr 2016 16:38:33 +0200 Committer: Ingo Molnar CommitDate: Wed, 13 Apr 2016 12:25:22 +0200 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 Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1460385514-14700-1-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar --- kernel/sched/clock.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index fedb967..30c4b20 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -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(); + return sched_clock_cpu(cpu); } /* @@ -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(); + return sched_clock_cpu(raw_smp_processor_id()); } #else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */