path: root/arch/m68k
diff options
authorPeter Zijlstra <peterz@infradead.org>2015-04-24 01:12:32 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-07-27 14:06:24 +0200
commitde9e432cb5de1bf2952919dc0b22e4bec0ed8d53 (patch)
treef67d751e7d52f45279950f2a7594d7a2ff5a0bbd /arch/m68k
parente6942b7de2dfe44ebde9bae57dadece5abca9de8 (diff)
atomic: Collapse all atomic_{set,clear}_mask definitions
Move the now generic definitions of atomic_{set,clear}_mask() into linux/atomic.h to avoid endless and pointless repetition. Also, provide an atomic_andnot() wrapper for those few archs that can implement that. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68k')
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h
index 93ebd96aa494..039fac120cc0 100644
--- a/arch/m68k/include/asm/atomic.h
+++ b/arch/m68k/include/asm/atomic.h
@@ -174,16 +174,6 @@ static inline int atomic_add_negative(int i, atomic_t *v)
return c != 0;
-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);
static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
int c, old;