From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965888AbcCJLGh (ORCPT ); Thu, 10 Mar 2016 06:06:37 -0500 Received: from torg.zytor.com ([198.137.202.12]:38312 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965868AbcCJLG1 (ORCPT ); Thu, 10 Mar 2016 06:06:27 -0500 Date: Thu, 10 Mar 2016 03:05:50 -0800 From: tip-bot for Davidlohr Bueso Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, linux-kernel@vger.kernel.org, dbueso@suse.de, hpa@zytor.com, torvalds@linux-foundation.org, dave@stgolabs.net Reply-To: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, dbueso@suse.de, linux-kernel@vger.kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, dave@stgolabs.net In-Reply-To: <1457574936-19065-2-git-send-email-dbueso@suse.de> References: <1457574936-19065-2-git-send-email-dbueso@suse.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/csd_lock: Explicitly inline csd_lock*() helpers Git-Commit-ID: 90d1098478fb08a1ef166fe91622d8046869e17b 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: 90d1098478fb08a1ef166fe91622d8046869e17b Gitweb: http://git.kernel.org/tip/90d1098478fb08a1ef166fe91622d8046869e17b Author: Davidlohr Bueso AuthorDate: Wed, 9 Mar 2016 17:55:35 -0800 Committer: Ingo Molnar CommitDate: Thu, 10 Mar 2016 10:28:35 +0100 locking/csd_lock: Explicitly inline csd_lock*() helpers While the compiler tends to already to it for us (except for csd_unlock), make it explicit. These helpers mainly deal with the ->flags, are short-lived and can be called, for example, from smp_call_function_many(). Signed-off-by: Davidlohr Bueso Acked-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: dave@stgolabs.net Link: http://lkml.kernel.org/r/1457574936-19065-2-git-send-email-dbueso@suse.de Signed-off-by: Ingo Molnar --- kernel/smp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/smp.c b/kernel/smp.c index d903c02..5099db1 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -105,13 +105,13 @@ void __init call_function_init(void) * previous function call. For multi-cpu calls its even more interesting * as we'll have to ensure no other cpu is observing our csd. */ -static void csd_lock_wait(struct call_single_data *csd) +static __always_inline void csd_lock_wait(struct call_single_data *csd) { while (smp_load_acquire(&csd->flags) & CSD_FLAG_LOCK) cpu_relax(); } -static void csd_lock(struct call_single_data *csd) +static __always_inline void csd_lock(struct call_single_data *csd) { csd_lock_wait(csd); csd->flags |= CSD_FLAG_LOCK; @@ -124,7 +124,7 @@ static void csd_lock(struct call_single_data *csd) smp_wmb(); } -static void csd_unlock(struct call_single_data *csd) +static __always_inline void csd_unlock(struct call_single_data *csd) { WARN_ON(!(csd->flags & CSD_FLAG_LOCK));