diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 5bb44333d3203377e3ea759e1e6ef8929b1ddac6..79343e37b4558a50b1bffb15ab0f52b263444675 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