Commit 90fe6514 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

atomic: Add atomic_long_t bitops

When adding the atomic bitops, I seem to have forgotten about
atomic_long_t, fix this.
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 4bbffe71
...@@ -112,19 +112,23 @@ static inline void atomic_long_dec(atomic_long_t *l) ...@@ -112,19 +112,23 @@ static inline void atomic_long_dec(atomic_long_t *l)
ATOMIC_LONG_PFX(_dec)(v); ATOMIC_LONG_PFX(_dec)(v);
} }
static inline void atomic_long_add(long i, atomic_long_t *l) #define ATOMIC_LONG_OP(op) \
{ static inline void \
ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l; atomic_long_##op(long i, atomic_long_t *l) \
{ \
ATOMIC_LONG_PFX(_add)(i, v); ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l; \
\
ATOMIC_LONG_PFX(_##op)(i, v); \
} }
static inline void atomic_long_sub(long i, atomic_long_t *l) ATOMIC_LONG_OP(add)
{ ATOMIC_LONG_OP(sub)
ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l; ATOMIC_LONG_OP(and)
ATOMIC_LONG_OP(or)
ATOMIC_LONG_OP(xor)
ATOMIC_LONG_OP(andnot)
ATOMIC_LONG_PFX(_sub)(i, v); #undef ATOMIC_LONG_OP
}
static inline int atomic_long_sub_and_test(long i, atomic_long_t *l) static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
{ {
......
...@@ -451,7 +451,6 @@ static inline int atomic_dec_if_positive(atomic_t *v) ...@@ -451,7 +451,6 @@ static inline int atomic_dec_if_positive(atomic_t *v)
} }
#endif #endif
#include <asm-generic/atomic-long.h>
#ifdef CONFIG_GENERIC_ATOMIC64 #ifdef CONFIG_GENERIC_ATOMIC64
#include <asm-generic/atomic64.h> #include <asm-generic/atomic64.h>
#endif #endif
...@@ -463,4 +462,6 @@ static inline void atomic64_andnot(long long i, atomic64_t *v) ...@@ -463,4 +462,6 @@ static inline void atomic64_andnot(long long i, atomic64_t *v)
} }
#endif #endif
#include <asm-generic/atomic-long.h>
#endif /* _LINUX_ATOMIC_H */ #endif /* _LINUX_ATOMIC_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment