diff --git a/[refs] b/[refs] index 595ded7b6987..aefa502a966d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20fe1d30e7e1c2ee36f11856f090613b0ad58b48 +refs/heads/master: bdda1561ffda764583a295229db66d94cf6038a3 diff --git a/trunk/include/asm-x86_64/cmpxchg.h b/trunk/include/asm-x86_64/cmpxchg.h index 09a6b6b6b74d..5e182062e6ec 100644 --- a/trunk/include/asm-x86_64/cmpxchg.h +++ b/trunk/include/asm-x86_64/cmpxchg.h @@ -128,7 +128,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\ (unsigned long)(n),sizeof(*(ptr)))) #define cmpxchg_local(ptr,o,n)\ - ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\ + ((__typeof__(*(ptr)))__cmpxchg_local((ptr),(unsigned long)(o),\ (unsigned long)(n),sizeof(*(ptr)))) #endif