projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ebdf1c)
s390: remove diag 44 calls from cpu_relax()
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 15 Sep 2014 08:50:47 +0000 (10:50 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 28 Nov 2014 08:47:49 +0000 (09:47 +0100)
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>
arch/s390/include/asm/processor.h patch | blob | blame | history

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index d559bdb03d18325f5c5fda2e97eb0136aeb1baf3..bed05ea7ec27eb236cc65b2007379fa6f61fb865 100644 (file)
--- 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();
 }