From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752252AbcAEIDU (ORCPT ); Tue, 5 Jan 2016 03:03:20 -0500 Received: from e06smtp06.uk.ibm.com ([195.75.94.102]:48013 "EHLO e06smtp06.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752133AbcAEIDL (ORCPT ); Tue, 5 Jan 2016 03:03:11 -0500 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: schwidefsky@de.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, 5 Jan 2016 09:03:01 +0100 From: Martin Schwidefsky To: "Michael S. Tsirkin" Cc: Peter Zijlstra , linux-kernel@vger.kernel.org, Arnd Bergmann , linux-arch@vger.kernel.org, Andrew Cooper , virtualization@lists.linux-foundation.org, Stefano Stabellini , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , 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, Heiko Carstens , Ingo Molnar , Davidlohr Bueso , Andrey Konovalov , Christian Borntraeger Subject: Re: [PATCH v2 06/32] s390: reuse asm-generic/barrier.h Message-ID: <20160105090301.3f9939be@mschwide> In-Reply-To: <20160104224135-mutt-send-email-mst@redhat.com> 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> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16010508-0025-0000-0000-0000056D06F7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.