Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e06ef372 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1aae0560

arch/s390/include/asm/barrier.h

+3 −6
Original line number Diff line number Diff line
@@ -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");

#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()