diff --git a/[refs] b/[refs]
index fca472d7f3d8..41057ee827e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80af4eeb726f038eddc32826e4238feba5b1dfb4
+refs/heads/master: b62f13439147210d5ad4bc40acee32b94c59f06d
diff --git a/trunk/include/asm-v850/system.h b/trunk/include/asm-v850/system.h
index a34ddfafd561..7daf1fdee119 100644
--- a/trunk/include/asm-v850/system.h
+++ b/trunk/include/asm-v850/system.h
@@ -103,6 +103,21 @@ static inline unsigned long __xchg (unsigned long with,
 	return tmp;
 }
 
+#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
+
 #define arch_align_stack(x) (x)
 
 #endif /* __V850_SYSTEM_H__ */