From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762954AbcALQkP (ORCPT ); Tue, 12 Jan 2016 11:40:15 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:60187 "EHLO e32.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753676AbcALQkH (ORCPT ); Tue, 12 Jan 2016 11:40:07 -0500 X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: paulmck@linux.vnet.ibm.com X-IBM-RcptTo: linux-arch@vger.kernel.org;linux-ia64@vger.kernel.org;linux-kernel@vger.kernel.org;linux-metag@vger.kernel.org;linux-s390@vger.kernel.org;linux-sh@vger.kernel.org;sparclinux@vger.kernel.org Date: Tue, 12 Jan 2016 08:31:02 -0800 From: "Paul E. McKenney" To: "Michael S. Tsirkin" Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Arnd Bergmann , linux-arch@vger.kernel.org, Andrew Cooper , Russell King - ARM Linux , virtualization@lists.linux-foundation.org, Stefano Stabellini , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Joe Perches , David Miller , linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, x86@kernel.org, user-mode-linux-devel@lists.sourceforge.net, adi-buildroot-devel@lists.sourceforge.net, linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org, xen-devel@lists.xenproject.org, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Ingo Molnar , Davidlohr Bueso Subject: Re: [PATCH v3 05/41] powerpc: reuse asm-generic/barrier.h Message-ID: <20160112163102.GE3818@linux.vnet.ibm.com> Reply-To: paulmck@linux.vnet.ibm.com References: <1452426622-4471-1-git-send-email-mst@redhat.com> <1452426622-4471-6-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452426622-4471-6-git-send-email-mst@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16011216-0005-0000-0000-00001B5E778D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jan 10, 2016 at 04:17:09PM +0200, Michael S. Tsirkin wrote: > On powerpc read_barrier_depends, smp_read_barrier_depends > smp_store_mb(), smp_mb__before_atomic and smp_mb__after_atomic match the > asm-generic variants exactly. Drop the local definitions and pull in > asm-generic/barrier.h instead. > > This is in preparation to refactoring this code area. > > Signed-off-by: Michael S. Tsirkin > Acked-by: Arnd Bergmann Looks sane to me. Reviewed-by: Paul E. McKenney > --- > arch/powerpc/include/asm/barrier.h | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h > index a7af5fb..980ad0c 100644 > --- a/arch/powerpc/include/asm/barrier.h > +++ b/arch/powerpc/include/asm/barrier.h > @@ -34,8 +34,6 @@ > #define rmb() __asm__ __volatile__ ("sync" : : : "memory") > #define wmb() __asm__ __volatile__ ("sync" : : : "memory") > > -#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); smp_mb(); } while (0) > - > #ifdef __SUBARCH_HAS_LWSYNC > # define SMPWMB LWSYNC > #else > @@ -60,9 +58,6 @@ > #define smp_wmb() barrier() > #endif /* CONFIG_SMP */ > > -#define read_barrier_depends() do { } while (0) > -#define smp_read_barrier_depends() do { } while (0) > - > /* > * This is a barrier which prevents following instructions from being > * started until the value of the argument x is known. For example, if > @@ -87,8 +82,8 @@ do { \ > ___p1; \ > }) > > -#define smp_mb__before_atomic() smp_mb() > -#define smp_mb__after_atomic() smp_mb() > #define smp_mb__before_spinlock() smp_mb() > > +#include > + > #endif /* _ASM_POWERPC_BARRIER_H */ > -- > MST >