diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-01-30 13:56:14 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-02-14 15:55:11 +0100 |
| commit | e06ef372839c0c33f5f91f892ae632cef38cd259 (patch) | |
| tree | 6389af031509ec16bdd1588c099cddb3afbddf8f /arch/s390 | |
| parent | 1aae0560d160ee6ebef927a35e4f405306a079df (diff) | |
| download | linux-e06ef372839c0c33f5f91f892ae632cef38cd259.tar.bz2 | |
s390/barrier: convert mb() to define again
Some of the now available common code drivers only compile if mb() is a define.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/barrier.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h index 10a508802940..16760eeb79b0 100644 --- a/arch/s390/include/asm/barrier.h +++ b/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() |