[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-22b6430d36659b37ed139b7fd87fcc7237fb0cfd@git.kernel.org>
Date: Wed, 16 Nov 2016 04:09:59 -0800
From: tip-bot for Christian Borntraeger <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, npiggin@...il.com,
will.deacon@....com, torvalds@...ux-foundation.org,
heiko.carstens@...ibm.com, schwidefsky@...ibm.com,
peterz@...radead.org, borntraeger@...ibm.com,
catalin.marinas@....com, mingo@...nel.org, linux@...linux.org.uk,
tglx@...utronix.de, noamc@...hip.com, hpa@...or.com
Subject: [tip:locking/core] locking/core, s390: Make cpu_relax() a barrier
again
Commit-ID: 22b6430d36659b37ed139b7fd87fcc7237fb0cfd
Gitweb: http://git.kernel.org/tip/22b6430d36659b37ed139b7fd87fcc7237fb0cfd
Author: Christian Borntraeger <borntraeger@...ibm.com>
AuthorDate: Tue, 25 Oct 2016 11:03:13 +0200
Committer: Ingo Molnar <mingo@...nel.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 <borntraeger@...ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Catalin Marinas <catalin.marinas@....com>
Cc: Heiko Carstens <heiko.carstens@...ibm.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@...ibm.com>
Cc: Nicholas Piggin <npiggin@...il.com>
Cc: Noam Camus <noamc@...hip.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Russell King <linux@...linux.org.uk>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Will Deacon <will.deacon@....com>
Cc: linuxppc-dev@...ts.ozlabs.org
Cc: virtualization@...ts.linux-foundation.org
Cc: xen-devel@...ts.xenproject.org
Link: http://lkml.kernel.org/r/1477386195-32736-4-git-send-email-borntraeger@de.ibm.com
Signed-off-by: Ingo Molnar <mingo@...nel.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
Powered by blists - more mailing lists