Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70ed4739 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

ia64: Provide atomic_{or,xor,and} 



Implement atomic logic ops -- atomic_{or,xor,and}.

These will replace the atomic_{set,clear}_mask functions that are
available on some archs.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 610f7ba9

arch/ia64/include/asm/atomic.h

+22 −4
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ ia64_atomic_##op (int i, atomic_t *v) \ 
ATOMIC_OP(add, +)

ATOMIC_OP(sub, -)



#undef ATOMIC_OP



#define atomic_add_return(i,v)						\

({									\

	int __ia64_aar_i = (i);						\
@@ -71,6 +69,18 @@ ATOMIC_OP(sub, -) 
		: ia64_atomic_sub(__ia64_asr_i, v);			\

})



#define CONFIG_ARCH_HAS_ATOMIC_OR



ATOMIC_OP(and, &)

ATOMIC_OP(or, |)

ATOMIC_OP(xor, ^)



#define atomic_and(i,v)	(void)ia64_atomic_and(i,v)

#define atomic_or(i,v)	(void)ia64_atomic_or(i,v)

#define atomic_xor(i,v)	(void)ia64_atomic_xor(i,v)



#undef ATOMIC_OP



#define ATOMIC64_OP(op, c_op)						\

static __inline__ long							\

ia64_atomic64_##op (__s64 i, atomic64_t *v)				\
@@ -89,8 +99,6 @@ ia64_atomic64_##op (__s64 i, atomic64_t *v) \ 
ATOMIC64_OP(add, +)

ATOMIC64_OP(sub, -)



#undef ATOMIC64_OP



#define atomic64_add_return(i,v)					\

({									\

	long __ia64_aar_i = (i);					\
@@ -115,6 +123,16 @@ ATOMIC64_OP(sub, -) 
		: ia64_atomic64_sub(__ia64_asr_i, v);			\

})



ATOMIC64_OP(and, &)

ATOMIC64_OP(or, |)

ATOMIC64_OP(xor, ^)



#define atomic64_and(i,v)	(void)ia64_atomic64_and(i,v)

#define atomic64_or(i,v)	(void)ia64_atomic64_or(i,v)

#define atomic64_xor(i,v)	(void)ia64_atomic64_xor(i,v)



#undef ATOMIC64_OP



#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), old, new))

#define atomic_xchg(v, new) (xchg(&((v)->counter), new))