From 7300940fa85d8a8ce706f2a6592a8c1409b9b204 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 17 Nov 2005 17:05:25 -0800 Subject: [PATCH] ARM: OMAP: Manual merge after sync with mainline Manual merge after sync with mainline --- include/asm-arm/atomic.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h index 5ef3eb44ef3..d586f65c822 100644 --- a/include/asm-arm/atomic.h +++ b/include/asm-arm/atomic.h @@ -12,7 +12,7 @@ #define __ASM_ARM_ATOMIC_H #include -#include +#include typedef struct { volatile int counter; } atomic_t; @@ -83,11 +83,12 @@ static inline int atomic_sub_return(int i, atomic_t *v) static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) { - u32 oldval, res; + unsigned long oldval, res; do { __asm__ __volatile__("@ atomic_cmpxchg\n" "ldrex %1, [%2]\n" + "mov %0, #0\n" "teq %1, %3\n" "strexeq %0, %4, [%2]\n" : "=&r" (res), "=&r" (oldval) -- 2.41.1