Merge git://www.linux-watchdog.org/linux-watchdog

[karo-tx-linux.git] / arch / frv / include / asm / atomic.h

diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
index 74d22454d7c63d565cdb4e1dd0b5acd3f34f9ec7..0da689def4cc66feec44f0e84e7be1c7c095817b 100644 (file)
--- a/arch/frv/include/asm/atomic.h
+++ b/arch/frv/include/asm/atomic.h
@@ -192,22 +192,10 @@ static inline void atomic64_##op(long long i, atomic64_t *v)              \
        (void)__atomic64_fetch_##op(i, &v->counter);                    \
 }
 
-#define CONFIG_ARCH_HAS_ATOMIC_OR
-
 ATOMIC_OP(or)
 ATOMIC_OP(and)
 ATOMIC_OP(xor)
 
 #undef ATOMIC_OP
 
-static inline __deprecated void atomic_clear_mask(unsigned int mask, atomic_t *v)
-{
-       atomic_and(~mask, v);
-}
-
-static inline __deprecated void atomic_set_mask(unsigned int mask, atomic_t *v)
-{
-       atomic_or(mask, v);
-}
-
 #endif /* _ASM_ATOMIC_H */