Skip to content

Commit

Permalink
arm64: Make atomic64_t() return "long", not "long long"
Browse files Browse the repository at this point in the history
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 <bhelgaas@google.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Bjorn Helgaas authored and Catalin Marinas committed May 9, 2014
1 parent a501e32 commit ba6bf8c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm64/include/asm/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ba6bf8c

Please sign in to comment.