From ad07ab3e8b74f3f9d97ecd1245dc7ada87b48229 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 30 Jan 2013 13:56:14 +0100
Subject: [PATCH] --- yaml --- r: 356116 b: refs/heads/master c:
 e06ef372839c0c33f5f91f892ae632cef38cd259 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/s390/include/asm/barrier.h | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0053ed3e8800..25c85ec0af6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aae0560d160ee6ebef927a35e4f405306a079df
+refs/heads/master: e06ef372839c0c33f5f91f892ae632cef38cd259
diff --git a/trunk/arch/s390/include/asm/barrier.h b/trunk/arch/s390/include/asm/barrier.h
index 10a508802940..16760eeb79b0 100644
--- a/trunk/arch/s390/include/asm/barrier.h
+++ b/trunk/arch/s390/include/asm/barrier.h
@@ -13,15 +13,12 @@
  * to devices.
  */
 
-static inline void mb(void)
-{
 #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES
-	/* Fast-BCR without checkpoint synchronization */
-	asm volatile("bcr 14,0" : : : "memory");
+/* Fast-BCR without checkpoint synchronization */
+#define mb() do {  asm volatile("bcr 14,0" : : : "memory"); } while (0)
 #else
-	asm volatile("bcr 15,0" : : : "memory");
+#define mb() do {  asm volatile("bcr 15,0" : : : "memory"); } while (0)
 #endif
-}
 
 #define rmb()				mb()
 #define wmb()				mb()