The patch titled Add cmpxchg_local to sh64 has been removed from the -mm tree. Its filename was add-cmpxchg_local-to-sh64.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ Subject: Add cmpxchg_local to sh64 From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> 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@xxxxxxxxxx> Cc: Paul Mundt <lethal@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-sh64/system.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff -puN include/asm-sh64/system.h~add-cmpxchg_local-to-sh64 include/asm-sh64/system.h --- a/include/asm-sh64/system.h~add-cmpxchg_local-to-sh64 +++ a/include/asm-sh64/system.h @@ -163,6 +163,21 @@ static __inline__ unsigned long __xchg(u return x; } +#include <asm-generic/cmpxchg-local.h> + +/* + * 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))) +#define cmpxchg64_local(ptr,o,n) __cmpxchg64_local_generic((ptr), (o), (n)) + +#ifndef CONFIG_SMP +#include <asm-generic/cmpxchg.h> +#endif + /* XXX * disable hlt during certain critical i/o operations */ _ Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are local_t-documentation-update-2.patch markers-fix-warnings.patch add-cmpxchg_local-to-sh64.patch add-cmpxchg_local-to-sparc-move-__cmpxchg-to-systemh.patch add-cmpxchg_local-to-sparc64.patch add-cmpxchg_local-to-v850.patch add-cmpxchg_local-to-xtensa.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html