asm-generic: merge branch 'master' of torvalds/linux-2.6

[safe/jmp/linux-2.6] / include / asm-generic / atomic-long.h

diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
index 76e27d6..b7babf0 100644 (file)
--- a/include/asm-generic/atomic-long.h
+++ b/include/asm-generic/atomic-long.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  */