diff options
Diffstat (limited to 'arch/tile/include/asm/bitops_32.h')
-rw-r--r-- | arch/tile/include/asm/bitops_32.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/tile/include/asm/bitops_32.h b/arch/tile/include/asm/bitops_32.h index 386865ad2f55..bbf7b666f21d 100644 --- a/arch/tile/include/asm/bitops_32.h +++ b/arch/tile/include/asm/bitops_32.h | |||
@@ -49,8 +49,8 @@ static inline void set_bit(unsigned nr, volatile unsigned long *addr) | |||
49 | * restricted to acting on a single-word quantity. | 49 | * restricted to acting on a single-word quantity. |
50 | * | 50 | * |
51 | * clear_bit() may not contain a memory barrier, so if it is used for | 51 | * clear_bit() may not contain a memory barrier, so if it is used for |
52 | * locking purposes, you should call smp_mb__before_clear_bit() and/or | 52 | * locking purposes, you should call smp_mb__before_atomic() and/or |
53 | * smp_mb__after_clear_bit() to ensure changes are visible on other cpus. | 53 | * smp_mb__after_atomic() to ensure changes are visible on other cpus. |
54 | */ | 54 | */ |
55 | static inline void clear_bit(unsigned nr, volatile unsigned long *addr) | 55 | static inline void clear_bit(unsigned nr, volatile unsigned long *addr) |
56 | { | 56 | { |
@@ -121,10 +121,6 @@ static inline int test_and_change_bit(unsigned nr, | |||
121 | return (_atomic_xor(addr, mask) & mask) != 0; | 121 | return (_atomic_xor(addr, mask) & mask) != 0; |
122 | } | 122 | } |
123 | 123 | ||
124 | /* See discussion at smp_mb__before_atomic_dec() in <asm/atomic_32.h>. */ | ||
125 | #define smp_mb__before_clear_bit() smp_mb() | ||
126 | #define smp_mb__after_clear_bit() do {} while (0) | ||
127 | |||
128 | #include <asm-generic/bitops/ext2-atomic.h> | 124 | #include <asm-generic/bitops/ext2-atomic.h> |
129 | 125 | ||
130 | #endif /* _ASM_TILE_BITOPS_32_H */ | 126 | #endif /* _ASM_TILE_BITOPS_32_H */ |