From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757979AbcLONNH (ORCPT ); Thu, 15 Dec 2016 08:13:07 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:45987 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757522AbcLONNE (ORCPT ); Thu, 15 Dec 2016 08:13:04 -0500 Message-Id: <20161215130950.010733378@infradead.org> User-Agent: quilt/0.63-1 Date: Thu, 15 Dec 2016 14:04:56 +0100 From: Peter Zijlstra To: tglx@linutronix.de, mingo@kernel.org, rafael@kernel.org, nmorey@kalray.eu Cc: srinivas.pandruvada@linux.intel.com, jacob.jun.pan@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org Subject: [RFC][PATCH 2/4] sched/clock: Update static_key usage References: <20161215130454.914605806@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-sched-clock-static_branch.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sched_clock was still using the deprecated static_key interface. Signed-off-by: Peter Zijlstra (Intel) --- kernel/sched/clock.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -78,19 +78,17 @@ EXPORT_SYMBOL_GPL(sched_clock); __read_mostly int sched_clock_running; #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK -static struct static_key __sched_clock_stable = STATIC_KEY_INIT; +static DEFINE_STATIC_KEY_FALSE(__sched_clock_stable); static int __sched_clock_stable_early; int sched_clock_stable(void) { - return static_key_false(&__sched_clock_stable); + return static_branch_likely(&__sched_clock_stable); } static void __set_sched_clock_stable(void) { - if (!sched_clock_stable()) - static_key_slow_inc(&__sched_clock_stable); - + static_branch_enable(&__sched_clock_stable); tick_dep_clear(TICK_DEP_BIT_CLOCK_UNSTABLE); } @@ -109,9 +107,7 @@ void set_sched_clock_stable(void) static void __clear_sched_clock_stable(struct work_struct *work) { /* XXX worry about clock continuity */ - if (sched_clock_stable()) - static_key_slow_dec(&__sched_clock_stable); - + static_branch_disable(&__sched_clock_stable); tick_dep_set(TICK_DEP_BIT_CLOCK_UNSTABLE); }