From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 15 Sep 2014 08:50:47 +0000 (+0200)
Subject: s390: remove diag 44 calls from cpu_relax()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=57f2ffe14fd125c240babd88b99d8a57d3ed060e;p=linux-beck.git

s390: remove diag 44 calls from cpu_relax()

Simplify cpu_relax() to a simple barrier(). Performance wise this doesn't
seem to make any big difference anymore, since nearly all lock variants
have directed yield semantics in the meantime.
Also this makes s390 behave like all other architectures.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index d559bdb03d18..bed05ea7ec27 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -217,8 +217,6 @@ static inline unsigned short stap(void)
  */
 static inline void cpu_relax(void)
 {
-	if (MACHINE_HAS_DIAG44)
-		asm volatile("diag 0,0,68");
 	barrier();
 }