From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752834AbdJMQMk (ORCPT ); Fri, 13 Oct 2017 12:12:40 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:38334 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333AbdJMQMf (ORCPT ); Fri, 13 Oct 2017 12:12:35 -0400 From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@kernel.org, mathieu.desnoyers@efficios.com, peterz@infradead.org, boqun.feng@gmail.com, ahh@google.com, maged.michael@gmail.com, gromer@google.com, avi@scylladb.com, benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, davejwatson@fb.com, stern@rowland.harvard.edu, will.deacon@arm.com, luto@kernel.org, viro@zeniv.linux.org.uk, piggin@gmail.com, linux-arch@vger.kernel.org, "Paul E. McKenney" , Ingo Molnar , linuxppc-dev@lists.ozlabs.org Subject: [PATCH tip/sched/membarrier 4/5] membarrier: Remove unused code for architectures without membarrier hooks Date: Fri, 13 Oct 2017 09:12:24 -0700 X-Mailer: git-send-email 2.5.2 In-Reply-To: <20171012170051.GA27468@linux.vnet.ibm.com> References: <20171012170051.GA27468@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17101316-0056-0000-0000-000003D98B1B X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007891; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000236; SDB=6.00930613; UDB=6.00468483; IPR=6.00710879; BA=6.00005636; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017528; XFM=3.00000015; UTC=2017-10-13 16:12:32 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17101316-0057-0000-0000-000008108E70 Message-Id: <1507911145-4134-4-git-send-email-paulmck@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-10-13_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1710130223 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathieu Desnoyers Architectures without membarrier hooks don't need to emit the empty membarrier_arch_switch_mm() static inline when CONFIG_MEMBARRIER=y. Adapt the CONFIG_MEMBARRIER=n counterpart to only emit the empty membarrier_arch_switch_mm() for architectures with membarrier hooks. Reported-by: Nicholas Piggin Signed-off-by: Mathieu Desnoyers CC: Peter Zijlstra CC: Paul E. McKenney CC: Boqun Feng CC: Andrew Hunter CC: Maged Michael CC: gromer@google.com CC: Avi Kivity CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: Michael Ellerman CC: Dave Watson CC: Alan Stern CC: Will Deacon CC: Andy Lutomirski CC: Ingo Molnar CC: Alexander Viro CC: linuxppc-dev@lists.ozlabs.org CC: linux-arch@vger.kernel.org Signed-off-by: Paul E. McKenney --- include/linux/sched/mm.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h index e4955d293687..40379edac388 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -221,10 +221,6 @@ static inline void memalloc_noreclaim_restore(unsigned int flags) #ifdef CONFIG_ARCH_HAS_MEMBARRIER_HOOKS #include #else -static inline void membarrier_arch_switch_mm(struct mm_struct *prev, - struct mm_struct *next, struct task_struct *tsk) -{ -} static inline void membarrier_arch_fork(struct task_struct *t, unsigned long clone_flags) { @@ -253,10 +249,12 @@ static inline void membarrier_execve(struct task_struct *t) membarrier_arch_execve(t); } #else +#ifdef CONFIG_ARCH_HAS_MEMBARRIER_HOOKS static inline void membarrier_arch_switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk) { } +#endif static inline void membarrier_fork(struct task_struct *t, unsigned long clone_flags) { -- 2.5.2