s390/bitops: get rid of __BITOPS_BARRIER()

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

diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index 2bc357408f43d158da7899d3036e9541a9312f0a..4d8604e311f3aaf6b1799bd78760bcc52a5befab 100644 (file)
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -98,7 +98,6 @@ extern const char _sb_findmap[];
 #endif /* CONFIG_64BIT */
 
 #define __BITOPS_WORDS(bits) (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG)
-#define __BITOPS_BARRIER() asm volatile("" : : : "memory")
 
 #ifdef CONFIG_SMP
 /*
@@ -164,7 +163,7 @@ test_and_set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
        mask = 1UL << (nr & (BITS_PER_LONG - 1));
        /* Do the atomic update. */
        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_OR);
-       __BITOPS_BARRIER();
+       barrier();
        return (old & mask) != 0;
 }
 
@@ -183,7 +182,7 @@ test_and_clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
        mask = ~(1UL << (nr & (BITS_PER_LONG - 1)));
        /* Do the atomic update. */
        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_AND);
-       __BITOPS_BARRIER();
+       barrier();
        return (old ^ new) != 0;
 }
 
@@ -202,7 +201,7 @@ test_and_change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
        mask = 1UL << (nr & (BITS_PER_LONG - 1));
        /* Do the atomic update. */
        __BITOPS_LOOP(old, new, addr, mask, __BITOPS_XOR);
-       __BITOPS_BARRIER();
+       barrier();
        return (old & mask) != 0;
 }
 #endif /* CONFIG_SMP */