Skip to contentSkip to conversation

arm64: Make atomic64_t() return "long", not "long long"

PATCH New Bjorn Helgaas 2 participants 2 messages May 8, 2014 – May 9, 2014

Subsystems (2)
arm64 Atomic infrastructure
lore
Share & tools
lore

Bjorn Helgaas

author
#0 lore raw

PATCH 1/1 arm64: Make atomic64_t() return "long", not "long long"

arm64 sets CONFIG_64BIT=y and hence uses the "long counter" atomic64_t definition from include/linux/types.h. Make atomic64_read() return "long", not "long long".

Signed-off-by Bjorn Helgaas <[email protected]>
---
 arch/arm64/include/asm/atomic.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/include/asm/atomic.h +1 -1
index 0237f0867e37..9c48d74652cb 100644
@@ -162,7 +162,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
  */
 #define ATOMIC64_INIT(i) { (i) }
 
-#define atomic64_read(v)	(*(volatile long long *)&(v)->counter)
+#define atomic64_read(v)	(*(volatile long *)&(v)->counter)
 #define atomic64_set(v,i)	(((v)->counter) = (i))
 
 static inline void atomic64_add(u64 i, atomic64_t *v)
maintainer Applied
#1 lore raw

PATCH 1/1 arm64: Make atomic64_t() return "long", not "long long"

Quoted 14 lines · Bjorn Helgaas

arm64 sets CONFIG_64BIT=y and hence uses the "long counter" atomic64_t definition from include/linux/types.h. Make atomic64_read() return "long", not "long long".

Signed-off-by Bjorn Helgaas <[email protected]>
---
 arch/arm64/include/asm/atomic.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/include/asm/atomic.h +0 -0
index 0237f0867e37..9c48d74652cb 100644

arch/arm64/include/asm/atomic.h static inline int __atomic_add_unless(atomic_t *v, int a, int u) · line 166

Quoted 6 lines
arch/arm64/include/asm/atomic.h +1 -1
@@ -162,7 +162,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
  */
 #define ATOMIC64_INIT(i) { (i) }
 
-#define atomic64_read(v)	(*(volatile long long *)&(v)->counter)
+#define atomic64_read(v)	(*(volatile long *)&(v)->counter)
 #define atomic64_set(v,i)	(((v)->counter) = (i))

Applied, thanks.

Signature · 1 line
Catalin