From da2fdf55ea95181810de2f10360e6de685f3c15f Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Sun, 1 Apr 2012 16:38:41 -0400 Subject: [PATCH] --- yaml --- r: 298427 b: refs/heads/master c: 1512cdc3572dac34a1809764f9a646cde7e82407 h: refs/heads/master i: 298425: b8b6e0a690eaa42c413f8a2dfb4e0cb83affb929 298423: 47a6364484be3750da3aada44b4ffa6c6800671a v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/cmpxchg.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d2c2e33abd63..3be237fbfb27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d92e05118262379f76a220772b666dfddb77a9d +refs/heads/master: 1512cdc3572dac34a1809764f9a646cde7e82407 diff --git a/trunk/arch/blackfin/include/asm/cmpxchg.h b/trunk/arch/blackfin/include/asm/cmpxchg.h index ba2484f4cb2a..c05868cc61c1 100644 --- a/trunk/arch/blackfin/include/asm/cmpxchg.h +++ b/trunk/arch/blackfin/include/asm/cmpxchg.h @@ -122,7 +122,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, (unsigned long)(n), sizeof(*(ptr)))) #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) -#include +#define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n)) +#define cmpxchg64(ptr, o, n) cmpxchg64_local((ptr), (o), (n)) #endif /* !CONFIG_SMP */