diff options
Diffstat (limited to 'arch/mn10300/include/asm/atomic.h')
-rw-r--r-- | arch/mn10300/include/asm/atomic.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/mn10300/include/asm/atomic.h b/arch/mn10300/include/asm/atomic.h index 975e1841ca64..cadeb1e2cdfc 100644 --- a/arch/mn10300/include/asm/atomic.h +++ b/arch/mn10300/include/asm/atomic.h | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | #include <asm/irqflags.h> | 14 | #include <asm/irqflags.h> |
15 | #include <asm/cmpxchg.h> | 15 | #include <asm/cmpxchg.h> |
16 | #include <asm/barrier.h> | ||
16 | 17 | ||
17 | #ifndef CONFIG_SMP | 18 | #ifndef CONFIG_SMP |
18 | #include <asm-generic/atomic.h> | 19 | #include <asm-generic/atomic.h> |
@@ -234,12 +235,6 @@ static inline void atomic_set_mask(unsigned long mask, unsigned long *addr) | |||
234 | #endif | 235 | #endif |
235 | } | 236 | } |
236 | 237 | ||
237 | /* Atomic operations are already serializing on MN10300??? */ | ||
238 | #define smp_mb__before_atomic_dec() barrier() | ||
239 | #define smp_mb__after_atomic_dec() barrier() | ||
240 | #define smp_mb__before_atomic_inc() barrier() | ||
241 | #define smp_mb__after_atomic_inc() barrier() | ||
242 | |||
243 | #endif /* __KERNEL__ */ | 238 | #endif /* __KERNEL__ */ |
244 | #endif /* CONFIG_SMP */ | 239 | #endif /* CONFIG_SMP */ |
245 | #endif /* _ASM_ATOMIC_H */ | 240 | #endif /* _ASM_ATOMIC_H */ |