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

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

Add cmpxchg_local to frv 



Use the new generic cmpxchg_local (disables interrupt) for 8, 16 and 64 bits
arguments. Use the 32 bits cmpxchg available on the architecture for 32 bits
arguments.

Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7732ba3a

include/asm-frv/system.h

+24 −0
Original line number Diff line number Diff line
@@ -268,5 +268,29 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new); 


#endif



#include <asm-generic/cmpxchg-local.h>



static inline unsigned long __cmpxchg_local(volatile void *ptr,

				      unsigned long old,

				      unsigned long new, int size)

{

	switch (size) {

	case 4:

		return cmpxchg(ptr, old, new);

	default:

		return __cmpxchg_local_generic(ptr, old, new, size);

	}



	return old;

}



/*

 * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make

 * them available.

 */

#define cmpxchg_local(ptr, o, n)				  	\

	((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o),	\

			(unsigned long)(n), sizeof(*(ptr))))

#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))



#endif /* _ASM_SYSTEM_H */