forked from Minki/linux
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: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7fa2ac3728
commit
5da751035c
|
@ -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
|
||||||
|
@ -185,9 +189,26 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old,
|
||||||
return old;
|
return 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)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user