From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Schwidefsky Subject: Re: [PATCH v2 06/32] s390: reuse asm-generic/barrier.h Date: Tue, 5 Jan 2016 09:03:01 +0100 Message-ID: <20160105090301.3f9939be@mschwide> References: <1451572003-2440-1-git-send-email-mst@redhat.com> <1451572003-2440-7-git-send-email-mst@redhat.com> <20160104132042.GW6344@twins.programming.kicks-ass.net> <20160104160339.25101b5d@mschwide> <20160104224135-mutt-send-email-mst@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20160104224135-mutt-send-email-mst@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: "Michael S. Tsirkin" Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Peter Zijlstra , Heiko Carstens , virtualization@lists.linux-foundation.org, "H. Peter Anvin" , sparclinux@vger.kernel.org, Ingo Molnar , linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, Davidlohr Bueso , Arnd Bergmann , x86@kernel.org, Christian Borntraeger , xen-devel@lists.xenproject.org, Ingo Molnar , linux-xtensa@linux-xtensa.org, user-mode-linux-devel@lists.sourceforge.net, Stefano Stabellini , Andrey Konovalov , adi-buildroot-devel@lists.sourceforge.net, Thomas Gleixner , linux-metag@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Andrew List-Id: virtualization@lists.linuxfoundation.org On Mon, 4 Jan 2016 22:42:44 +0200 "Michael S. Tsirkin" wrote: > On Mon, Jan 04, 2016 at 04:03:39PM +0100, Martin Schwidefsky wrote: > > On Mon, 4 Jan 2016 14:20:42 +0100 > > Peter Zijlstra wrote: > > > > > On Thu, Dec 31, 2015 at 09:06:30PM +0200, Michael S. Tsirkin wrote: > > > > On s390 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 > > > > --- > > > > arch/s390/include/asm/barrier.h | 10 ++-------- > > > > 1 file changed, 2 insertions(+), 8 deletions(-) > > > > > > > > diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h > > > > index 7ffd0b1..c358c31 100644 > > > > --- a/arch/s390/include/asm/barrier.h > > > > +++ b/arch/s390/include/asm/barrier.h > > > > @@ -30,14 +30,6 @@ > > > > #define smp_rmb() rmb() > > > > #define smp_wmb() wmb() > > > > > > > > -#define read_barrier_depends() do { } while (0) > > > > -#define smp_read_barrier_depends() do { } while (0) > > > > - > > > > -#define smp_mb__before_atomic() smp_mb() > > > > -#define smp_mb__after_atomic() smp_mb() > > > > > > As per: > > > > > > lkml.kernel.org/r/20150921112252.3c2937e1@mschwide > > > > > > s390 should change this to barrier() instead of smp_mb() and hence > > > should not use the generic versions. > > > > Yes, we wanted to simplify this. Thanks for the reminder, I'll queue > > a patch. > > Could you base on my patchset maybe, to avoid conflicts, > and I'll merge it? > Or if it's just replacing these 2 with barrier() I can do this > myself easily. Probably the easiest solution if you do the patch yourself and include it in your patch set. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.