diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2015-04-24 01:12:32 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2015-07-27 14:06:24 +0200 |
| commit | de9e432cb5de1bf2952919dc0b22e4bec0ed8d53 (patch) | |
| tree | f67d751e7d52f45279950f2a7594d7a2ff5a0bbd /arch/metag | |
| parent | atomic: Provide atomic_{or,xor,and} (diff) | |
| download | linux-dev-de9e432cb5de1bf2952919dc0b22e4bec0ed8d53.tar.xz linux-dev-de9e432cb5de1bf2952919dc0b22e4bec0ed8d53.zip | |
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/metag')
| -rw-r--r-- | arch/metag/include/asm/atomic_lnkget.h | 10 | ||||
| -rw-r--r-- | arch/metag/include/asm/atomic_lock1.h | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/metag/include/asm/atomic_lnkget.h b/arch/metag/include/asm/atomic_lnkget.h index 0642606de901..21c4c268b86c 100644 --- a/arch/metag/include/asm/atomic_lnkget.h +++ b/arch/metag/include/asm/atomic_lnkget.h @@ -82,16 +82,6 @@ ATOMIC_OP(xor) #undef ATOMIC_OP_RETURN #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); -} - static inline int atomic_cmpxchg(atomic_t *v, int old, int new) { int result, temp; diff --git a/arch/metag/include/asm/atomic_lock1.h b/arch/metag/include/asm/atomic_lock1.h index 7d88725a85da..f8efe380fe8b 100644 --- a/arch/metag/include/asm/atomic_lock1.h +++ b/arch/metag/include/asm/atomic_lock1.h @@ -76,16 +76,6 @@ ATOMIC_OP(xor, ^=) #undef ATOMIC_OP_RETURN #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); -} - static inline int atomic_cmpxchg(atomic_t *v, int old, int new) { int ret; |