diff options
Diffstat (limited to 'arch/arc/include')
-rw-r--r-- | arch/arc/include/asm/atomic.h | 5 | ||||
-rw-r--r-- | arch/arc/include/asm/bitops.h | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h index 03e494f695d1..83f03ca6caf6 100644 --- a/arch/arc/include/asm/atomic.h +++ b/arch/arc/include/asm/atomic.h | |||
@@ -190,11 +190,6 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | |||
190 | 190 | ||
191 | #endif /* !CONFIG_ARC_HAS_LLSC */ | 191 | #endif /* !CONFIG_ARC_HAS_LLSC */ |
192 | 192 | ||
193 | #define smp_mb__before_atomic_dec() barrier() | ||
194 | #define smp_mb__after_atomic_dec() barrier() | ||
195 | #define smp_mb__before_atomic_inc() barrier() | ||
196 | #define smp_mb__after_atomic_inc() barrier() | ||
197 | |||
198 | /** | 193 | /** |
199 | * __atomic_add_unless - add unless the number is a given value | 194 | * __atomic_add_unless - add unless the number is a given value |
200 | * @v: pointer of type atomic_t | 195 | * @v: pointer of type atomic_t |
diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h index 647a83a8e756..ebc0cf3164dc 100644 --- a/arch/arc/include/asm/bitops.h +++ b/arch/arc/include/asm/bitops.h | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/compiler.h> | 21 | #include <linux/compiler.h> |
22 | #include <asm/barrier.h> | ||
22 | 23 | ||
23 | /* | 24 | /* |
24 | * Hardware assisted read-modify-write using ARC700 LLOCK/SCOND insns. | 25 | * Hardware assisted read-modify-write using ARC700 LLOCK/SCOND insns. |
@@ -496,10 +497,6 @@ static inline __attribute__ ((const)) int __ffs(unsigned long word) | |||
496 | */ | 497 | */ |
497 | #define ffz(x) __ffs(~(x)) | 498 | #define ffz(x) __ffs(~(x)) |
498 | 499 | ||
499 | /* TODO does this affect uni-processor code */ | ||
500 | #define smp_mb__before_clear_bit() barrier() | ||
501 | #define smp_mb__after_clear_bit() barrier() | ||
502 | |||
503 | #include <asm-generic/bitops/hweight.h> | 500 | #include <asm-generic/bitops/hweight.h> |
504 | #include <asm-generic/bitops/fls64.h> | 501 | #include <asm-generic/bitops/fls64.h> |
505 | #include <asm-generic/bitops/sched.h> | 502 | #include <asm-generic/bitops/sched.h> |