From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932409AbcKPMLq (ORCPT ); Wed, 16 Nov 2016 07:11:46 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35204 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751688AbcKPMLn (ORCPT ); Wed, 16 Nov 2016 07:11:43 -0500 Date: Wed, 16 Nov 2016 04:09:59 -0800 From: tip-bot for Christian Borntraeger Message-ID: Cc: linux-kernel@vger.kernel.org, npiggin@gmail.com, will.deacon@arm.com, torvalds@linux-foundation.org, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com, peterz@infradead.org, borntraeger@de.ibm.com, catalin.marinas@arm.com, mingo@kernel.org, linux@armlinux.org.uk, tglx@linutronix.de, noamc@ezchip.com, hpa@zytor.com Reply-To: npiggin@gmail.com, linux-kernel@vger.kernel.org, will.deacon@arm.com, torvalds@linux-foundation.org, peterz@infradead.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, tglx@linutronix.de, noamc@ezchip.com, linux@armlinux.org.uk, hpa@zytor.com, borntraeger@de.ibm.com, mingo@kernel.org, catalin.marinas@arm.com In-Reply-To: <1477386195-32736-4-git-send-email-borntraeger@de.ibm.com> References: <1477386195-32736-4-git-send-email-borntraeger@de.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/core, s390: Make cpu_relax() a barrier again Git-Commit-ID: 22b6430d36659b37ed139b7fd87fcc7237fb0cfd 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: 22b6430d36659b37ed139b7fd87fcc7237fb0cfd Gitweb: http://git.kernel.org/tip/22b6430d36659b37ed139b7fd87fcc7237fb0cfd Author: Christian Borntraeger AuthorDate: Tue, 25 Oct 2016 11:03:13 +0200 Committer: Ingo Molnar CommitDate: Wed, 16 Nov 2016 10:15:10 +0100 locking/core, s390: Make cpu_relax() a barrier again stop_machine() seemed to be the only important place for yielding during cpu_relax(). This was fixed by using cpu_relax_yield(). Therefore, we can now redefine cpu_relax() to be a barrier instead on s390, making s390 identical to all other architectures. Signed-off-by: Christian Borntraeger Signed-off-by: Peter Zijlstra (Intel) Cc: Catalin Marinas Cc: Heiko Carstens Cc: Linus Torvalds Cc: Martin Schwidefsky Cc: Nicholas Piggin Cc: Noam Camus Cc: Peter Zijlstra Cc: Russell King Cc: Thomas Gleixner Cc: Will Deacon Cc: linuxppc-dev@lists.ozlabs.org Cc: virtualization@lists.linux-foundation.org Cc: xen-devel@lists.xenproject.org Link: http://lkml.kernel.org/r/1477386195-32736-4-git-send-email-borntraeger@de.ibm.com Signed-off-by: Ingo Molnar --- arch/s390/include/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index 5bb4433..79343e3 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -236,7 +236,7 @@ static inline unsigned short stap(void) */ void cpu_relax_yield(void); -#define cpu_relax() cpu_relax_yield() +#define cpu_relax() barrier() #define cpu_relax_lowlatency() barrier() #define ECAG_CACHE_ATTRIBUTE 0