Commit 81979131 authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Linus Torvalds
Browse files

atomic.h: add atomic64 cmpxchg, xchg and add_unless to ia64 



Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e656e245

include/asm-ia64/atomic.h

+22 −2
Original line number Diff line number Diff line
@@ -88,12 +88,16 @@ ia64_atomic64_sub (__s64 i, atomic64_t *v) 
	return new;

}



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

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

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



#define atomic64_cmpxchg(v, old, new) \

	(cmpxchg(&((v)->counter), old, new))

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



#define atomic_add_unless(v, a, u)				\

({								\

	int c, old;						\

	__typeof__(v->counter) c, old;				\

	c = atomic_read(v);					\

	for (;;) {						\

		if (unlikely(c == (u)))				\
@@ -107,6 +111,22 @@ ia64_atomic64_sub (__s64 i, atomic64_t *v) 
})

#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



#define atomic64_add_unless(v, a, u)				\

({								\

	__typeof__(v->counter) c, old;				\

	c = atomic64_read(v);					\

	for (;;) {						\

		if (unlikely(c == (u)))				\

			break;					\

		old = atomic64_cmpxchg((v), c, c + (a));	\

		if (likely(old == c))				\

			break;					\

		c = old;					\

	}							\

	c != (u);						\

})

#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)



#define atomic_add_return(i,v)						\

({									\

	int __ia64_aar_i = (i);						\