diff --git a/[refs] b/[refs]
index 4b01b94821d9..5dbaea75fa96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29c2810276fbf8419c9b4d942b99c873e9b7640a
+refs/heads/master: 53e111a730ea8b002d57dd226098c12789993329
diff --git a/trunk/include/asm-generic/atomic.h b/trunk/include/asm-generic/atomic.h
index 3673a13b6703..81d3be459efb 100644
--- a/trunk/include/asm-generic/atomic.h
+++ b/trunk/include/asm-generic/atomic.h
@@ -134,7 +134,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
 #define atomic_long_cmpxchg(l, old, new) \
 	(atomic64_cmpxchg((atomic64_t *)(l), (old), (new)))
 #define atomic_long_xchg(v, new) \
-	(atomic64_xchg((atomic64_t *)(l), (new)))
+	(atomic64_xchg((atomic64_t *)(v), (new)))
 
 #else  /*  BITS_PER_LONG == 64  */