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

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

Add cmpxchg_local to m86k 



Use the new generic cmpxchg_local (disables interrupt). Also use the generic
cmpxchg as fallback if SMP is not set.

Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7fa2ac37

include/asm-m68k/system.h

+24 −3
Original line number Original line Diff line number Diff line
@@ -154,6 +154,10 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz 
}

}

#endif

#endif





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



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



/*

/*

 * Atomic compare and exchange.  Compare OLD with MEM, if identical,

 * Atomic compare and exchange.  Compare OLD with MEM, if identical,

 * store NEW in MEM.  Return the initial value in MEM.  Success is

 * store NEW in MEM.  Return the initial value in MEM.  Success is
@@ -188,6 +192,23 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, 
#define cmpxchg(ptr, o, n)						    \

#define cmpxchg(ptr, o, n)						    \

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

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

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

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

#define cmpxchg_local(ptr, o, n)					    \

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

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

#else



/*

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

 * them available.

 */

#define cmpxchg_local(ptr, o, n)				  	       \

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

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



#ifndef CONFIG_SMP

#include <asm-generic/cmpxchg.h>

#endif



#endif

#endif





#define arch_align_stack(x) (x)

#define arch_align_stack(x) (x)