diff --git a/[refs] b/[refs]
index 69ff94e7330d..3601eb562587 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e040a3e915d0a3da6caa665da7a458973e8f33e
+refs/heads/master: a5fc1abe438b87a9d128beebc377f78e2681a76d
diff --git a/trunk/include/asm-generic/atomic.h b/trunk/include/asm-generic/atomic.h
index 7abdaa91ccd3..3673a13b6703 100644
--- a/trunk/include/asm-generic/atomic.h
+++ b/trunk/include/asm-generic/atomic.h
@@ -132,9 +132,9 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
 #define atomic_long_inc_not_zero(l) atomic64_inc_not_zero((atomic64_t *)(l))
 
 #define atomic_long_cmpxchg(l, old, new) \
-	(atomic_cmpxchg((atomic64_t *)(l), (old), (new)))
+	(atomic64_cmpxchg((atomic64_t *)(l), (old), (new)))
 #define atomic_long_xchg(v, new) \
-	(atomic_xchg((atomic64_t *)(l), (new)))
+	(atomic64_xchg((atomic64_t *)(l), (new)))
 
 #else  /*  BITS_PER_LONG == 64  */