* [PATCH] arm64: Make atomic64_t() return "long", not "long long"
@ 2014-05-08 21:13 Bjorn Helgaas
2014-05-09 10:39 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Helgaas @ 2014-05-08 21:13 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm64/include/asm/atomic.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
index 0237f0867e37..9c48d74652cb 100644
--- a/arch/arm64/include/asm/atomic.h
+++ b/arch/arm64/include/asm/atomic.h
@@ -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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] arm64: Make atomic64_t() return "long", not "long long"
2014-05-08 21:13 [PATCH] arm64: Make atomic64_t() return "long", not "long long" Bjorn Helgaas
@ 2014-05-09 10:39 ` Catalin Marinas
0 siblings, 0 replies; 2+ messages in thread
From: Catalin Marinas @ 2014-05-09 10:39 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 08, 2014 at 10:13:47PM +0100, Bjorn Helgaas wrote:
> 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>
> ---
> arch/arm64/include/asm/atomic.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
> index 0237f0867e37..9c48d74652cb 100644
> --- a/arch/arm64/include/asm/atomic.h
> +++ b/arch/arm64/include/asm/atomic.h
> @@ -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.
--
Catalin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-09 10:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-08 21:13 [PATCH] arm64: Make atomic64_t() return "long", not "long long" Bjorn Helgaas
2014-05-09 10:39 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).