From 97350e249cfa5d587c8026f8a66e5d98a1e6e36a Mon Sep 17 00:00:00 2001 From: Jaccon Bastiaansen Date: Mon, 13 May 2013 17:28:27 +0100 Subject: [PATCH] --- yaml --- r: 375623 b: refs/heads/master c: 6eabb3301b1facee669d9938f7c5a0295c21d71d h: refs/heads/master i: 375621: a1a6a14a36d55564b2133eb36eb51f9126a60344 375619: 8c13d6c17af74f29a2a0e0fa7c1f83ba95880d7f 375615: d4ddef84f94fba501e2ac6ee0a9c13b6d8a9ae03 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/cmpxchg.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dbc250317ea4..bbd1737e951b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e01573b5cf8b3188c1f33493d2e73a30e8d25fc +refs/heads/master: 6eabb3301b1facee669d9938f7c5a0295c21d71d diff --git a/trunk/arch/arm/include/asm/cmpxchg.h b/trunk/arch/arm/include/asm/cmpxchg.h index 7eb18c1d8d6c..4f009c10540d 100644 --- a/trunk/arch/arm/include/asm/cmpxchg.h +++ b/trunk/arch/arm/include/asm/cmpxchg.h @@ -233,15 +233,15 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr, ((__typeof__(*(ptr)))atomic64_cmpxchg(container_of((ptr), \ atomic64_t, \ counter), \ - (unsigned long)(o), \ - (unsigned long)(n))) + (unsigned long long)(o), \ + (unsigned long long)(n))) #define cmpxchg64_local(ptr, o, n) \ ((__typeof__(*(ptr)))local64_cmpxchg(container_of((ptr), \ local64_t, \ a), \ - (unsigned long)(o), \ - (unsigned long)(n))) + (unsigned long long)(o), \ + (unsigned long long)(n))) #endif /* __LINUX_ARM_ARCH__ >= 6 */