[S390] cpu_relax() is supposed to have barrier() semantics.

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

1 files changed, 7 insertions, 9 deletions

diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index c5cbc4bd8414..5b71d3731723 100644
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -199,15 +199,13 @@ unsigned long get_wchan(struct task_struct *p);
 /*
  * Give up the time slice of the virtual PU.
  */
-#ifndef __s390x__
-# define cpu_relax()    asm volatile ("diag 0,0,68" : : : "memory")
-#else /* __s390x__ */
-# define cpu_relax() \
-        do { \
-                if (MACHINE_HAS_DIAG44) \
-                        asm volatile ("diag 0,0,68" : : : "memory"); \
-        } while (0)
-#endif /* __s390x__ */
+static inline void cpu_relax(void)
+{
+        if (MACHINE_HAS_DIAG44)
+                asm volatile ("diag 0,0,68" : : : "memory");
+        else
+                barrier();
+}
 
 /*
  * Set PSW to specified value.