diff options
Diffstat (limited to 'arch/m68k/include/asm/bitops.h')
-rw-r--r-- | arch/m68k/include/asm/bitops.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index c6baa913592a..b4a9b0d5928d 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #include <linux/compiler.h> | 15 | #include <linux/compiler.h> |
16 | #include <asm/barrier.h> | ||
16 | 17 | ||
17 | /* | 18 | /* |
18 | * Bit access functions vary across the ColdFire and 68k families. | 19 | * Bit access functions vary across the ColdFire and 68k families. |
@@ -67,12 +68,6 @@ static inline void bfset_mem_set_bit(int nr, volatile unsigned long *vaddr) | |||
67 | #define __set_bit(nr, vaddr) set_bit(nr, vaddr) | 68 | #define __set_bit(nr, vaddr) set_bit(nr, vaddr) |
68 | 69 | ||
69 | 70 | ||
70 | /* | ||
71 | * clear_bit() doesn't provide any barrier for the compiler. | ||
72 | */ | ||
73 | #define smp_mb__before_clear_bit() barrier() | ||
74 | #define smp_mb__after_clear_bit() barrier() | ||
75 | |||
76 | static inline void bclr_reg_clear_bit(int nr, volatile unsigned long *vaddr) | 71 | static inline void bclr_reg_clear_bit(int nr, volatile unsigned long *vaddr) |
77 | { | 72 | { |
78 | char *p = (char *)vaddr + (nr ^ 31) / 8; | 73 | char *p = (char *)vaddr + (nr ^ 31) / 8; |