FIXME: The ARM cmpxchg macro conflicts with the generic ones from
cmpxchg-local.
Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxx>
---
include/asm-arm/atomic.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
index b5ba735..7cdc2fd 100644
--- a/include/asm-arm/atomic.h
+++ b/include/asm-arm/atomic.h
@@ -146,7 +146,7 @@ static inline unsigned long __cmpxchg(volatile void *ptr,
return wrong_size_cmpxchg(ptr);
}
-#define cmpxchg(ptr,o,n) \
+#define cmpxchg__disabled(ptr,o,n) \
({ \
__typeof__(*(ptr)) _o_ = (o); \
__typeof__(*(ptr)) _n_ = (n); \
--
1.5.4.1.166.g6706d
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
