diff --git a/[refs] b/[refs]
index 10c8889912a2..ef85f572ac63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e0cb3c60b89c4a2512852ffc18601c72314a0f
+refs/heads/master: aebb77aef4b50a157bf0185de31d1aede3ca2312
diff --git a/trunk/include/asm-h8300/system.h b/trunk/include/asm-h8300/system.h
index 2c1e83f7b419..4b8e475908ae 100644
--- a/trunk/include/asm-h8300/system.h
+++ b/trunk/include/asm-h8300/system.h
@@ -138,6 +138,21 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
         asm("jmp @@0");			\
 })
 
+#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 /* _H8300_SYSTEM_H */