Commit-ID: 22b6430d36659b37ed139b7fd87fcc7237fb0cfd Gitweb: http://git.kernel.org/tip/22b6430d36659b37ed139b7fd87fcc7237fb0cfd Author: Christian Borntraeger <borntrae...@de.ibm.com> AuthorDate: Tue, 25 Oct 2016 11:03:13 +0200 Committer: Ingo Molnar <mi...@kernel.org> 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 <borntrae...@de.ibm.com> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Catalin Marinas <catalin.mari...@arm.com> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Cc: Nicholas Piggin <npig...@gmail.com> Cc: Noam Camus <no...@ezchip.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Russell King <li...@armlinux.org.uk> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Will Deacon <will.dea...@arm.com> Cc: linuxppc-...@lists.ozlabs.org Cc: virtualizat...@lists.linux-foundation.org Cc: xen-de...@lists.xenproject.org Link: http://lkml.kernel.org/r/1477386195-32736-4-git-send-email-borntrae...@de.ibm.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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
