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

Commit 6d79ef2d authored by Will Deacon's avatar Will Deacon Committed by Ingo Molnar
Browse files

locking, asm-generic: Add _{relaxed|acquire|release}() variants for 'atomic_long_t' 



This patch adds 'atomic_long_t' wrappers for the new relaxed atomic operations.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman.Long@hp.com
Cc: paulmck@linux.vnet.ibm.com
Link: http://lkml.kernel.org/r/1438880084-18856-4-git-send-email-will.deacon@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 586b610e

include/asm-generic/atomic-long.h

+59 −27
Original line number Original line Diff line number Diff line
@@ -34,19 +34,69 @@ typedef atomic_t atomic_long_t; 




#endif

#endif





static inline long atomic_long_read(atomic_long_t *l)

#define ATOMIC_LONG_READ_OP(mo)						\

{

static inline long atomic_long_read##mo(atomic_long_t *l)		\

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;

{									\



	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;		\

	return (long)ATOMIC_LONG_PFX(_read)(v);

									\

	return (long)ATOMIC_LONG_PFX(_read##mo)(v);			\

}

}

ATOMIC_LONG_READ_OP()

ATOMIC_LONG_READ_OP(_acquire)





static inline void atomic_long_set(atomic_long_t *l, long i)

#undef ATOMIC_LONG_READ_OP

{

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;





	ATOMIC_LONG_PFX(_set)(v, i);

#define ATOMIC_LONG_SET_OP(mo)						\

static inline void atomic_long_set##mo(atomic_long_t *l, long i)	\

{									\

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;		\

									\

	ATOMIC_LONG_PFX(_set##mo)(v, i);				\

}

ATOMIC_LONG_SET_OP()

ATOMIC_LONG_SET_OP(_release)



#undef ATOMIC_LONG_SET_OP



#define ATOMIC_LONG_ADD_SUB_OP(op, mo)					\

static inline long							\

atomic_long_##op##_return##mo(long i, atomic_long_t *l)			\

{									\

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;		\

									\

	return (long)ATOMIC_LONG_PFX(_##op##_return##mo)(i, v);		\

}

}

ATOMIC_LONG_ADD_SUB_OP(add,)

ATOMIC_LONG_ADD_SUB_OP(add, _relaxed)

ATOMIC_LONG_ADD_SUB_OP(add, _acquire)

ATOMIC_LONG_ADD_SUB_OP(add, _release)

ATOMIC_LONG_ADD_SUB_OP(sub,)

ATOMIC_LONG_ADD_SUB_OP(sub, _relaxed)

ATOMIC_LONG_ADD_SUB_OP(sub, _acquire)

ATOMIC_LONG_ADD_SUB_OP(sub, _release)



#undef ATOMIC_LONG_ADD_SUB_OP



#define atomic_long_cmpxchg_relaxed(l, old, new) \

	(ATOMIC_LONG_PFX(_cmpxchg_relaxed)((ATOMIC_LONG_PFX(_t) *)(l), \

					   (old), (new)))

#define atomic_long_cmpxchg_acquire(l, old, new) \

	(ATOMIC_LONG_PFX(_cmpxchg_acquire)((ATOMIC_LONG_PFX(_t) *)(l), \

					   (old), (new)))

#define atomic_long_cmpxchg_release(l, old, new) \

	(ATOMIC_LONG_PFX(_cmpxchg_release)((ATOMIC_LONG_PFX(_t) *)(l), \

					   (old), (new)))

#define atomic_long_cmpxchg(l, old, new) \

	(ATOMIC_LONG_PFX(_cmpxchg)((ATOMIC_LONG_PFX(_t) *)(l), (old), (new)))



#define atomic_long_xchg_relaxed(v, new) \

	(ATOMIC_LONG_PFX(_xchg_relaxed)((ATOMIC_LONG_PFX(_t) *)(v), (new)))

#define atomic_long_xchg_acquire(v, new) \

	(ATOMIC_LONG_PFX(_xchg_acquire)((ATOMIC_LONG_PFX(_t) *)(v), (new)))

#define atomic_long_xchg_release(v, new) \

	(ATOMIC_LONG_PFX(_xchg_release)((ATOMIC_LONG_PFX(_t) *)(v), (new)))

#define atomic_long_xchg(v, new) \

	(ATOMIC_LONG_PFX(_xchg)((ATOMIC_LONG_PFX(_t) *)(v), (new)))





static inline void atomic_long_inc(atomic_long_t *l)

static inline void atomic_long_inc(atomic_long_t *l)

{

{
@@ -104,20 +154,6 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l) 
	return ATOMIC_LONG_PFX(_add_negative)(i, v);

	return ATOMIC_LONG_PFX(_add_negative)(i, v);

}

}





static inline long atomic_long_add_return(long i, atomic_long_t *l)

{

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;



	return (long)ATOMIC_LONG_PFX(_add_return)(i, v);

}



static inline long atomic_long_sub_return(long i, atomic_long_t *l)

{

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;



	return (long)ATOMIC_LONG_PFX(_sub_return)(i, v);

}



static inline long atomic_long_inc_return(atomic_long_t *l)

static inline long atomic_long_inc_return(atomic_long_t *l)

{

{

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;

	ATOMIC_LONG_PFX(_t) *v = (ATOMIC_LONG_PFX(_t) *)l;
@@ -141,9 +177,5 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) 




#define atomic_long_inc_not_zero(l) \

#define atomic_long_inc_not_zero(l) \

	ATOMIC_LONG_PFX(_inc_not_zero)((ATOMIC_LONG_PFX(_t) *)(l))

	ATOMIC_LONG_PFX(_inc_not_zero)((ATOMIC_LONG_PFX(_t) *)(l))

#define atomic_long_cmpxchg(l, old, new) \

	(ATOMIC_LONG_PFX(_cmpxchg)((ATOMIC_LONG_PFX(_t) *)(l), (old), (new)))

#define atomic_long_xchg(v, new) \

	(ATOMIC_LONG_PFX(_xchg)((ATOMIC_LONG_PFX(_t) *)(v), (new)))





#endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
 
#endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */