Messages in this thread Patch in this message | | | Date | Thu, 22 Dec 2005 01:52:58 -0500 (EST) | From | Nicolas Pitre <> | Subject | [patch 1/5] mutex subsystem: fix asm-arm/atomic.h |
| |
The original patch added new definitions to include/asm-arm/atomic.h inside the #if __LINUX_ARM_ARCH__ >= 6 and therefore they were unavailable on non ARMv6 builds. Move them outside that #if.
Signed-off-by: Nicolas Pitre <nico@cam.org>
---
Index: linux-2.6/include/asm-arm/atomic.h =================================================================== --- linux-2.6.orig/include/asm-arm/atomic.h +++ linux-2.6/include/asm-arm/atomic.h @@ -99,19 +99,6 @@ static inline int atomic_cmpxchg(atomic_ return oldval; } -#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) - -/* - * Pull in the generic wrappers for atomic_dec_call_if_negative() and - * atomic_inc_call_if_nonpositive(). - * - * TODO: implement optimized primitives instead, or leave the generic - * implementation in place, or use the ARCH_IMPLEMENTS_MUTEX_FASTPATH - * mechanism to override the generic mutex_lock()/mutex_unlock() - * functions. - */ -#include <asm-generic/atomic-call-if.h> - static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) { unsigned long tmp, tmp2; @@ -188,6 +175,19 @@ static inline void atomic_clear_mask(uns #endif /* __LINUX_ARM_ARCH__ */ +#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) + +/* + * Pull in the generic wrappers for atomic_dec_call_if_negative() and + * atomic_inc_call_if_nonpositive(). + * + * TODO: implement optimized primitives instead, or leave the generic + * implementation in place, or use the ARCH_IMPLEMENTS_MUTEX_FASTPATH + * mechanism to override the generic mutex_lock()/mutex_unlock() + * functions. + */ +#include <asm-generic/atomic-call-if.h> + static inline int atomic_add_unless(atomic_t *v, int a, int u) { int c, old; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |