From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: Make atomic64_t() return "long", not "long long"
Date: Fri, 9 May 2014 11:39:37 +0100 [thread overview]
Message-ID: <20140509103937.GC7950@arm.com> (raw)
In-Reply-To: <20140508211347.18358.8154.stgit@bhelgaas-glaptop.roam.corp.google.com>
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
prev parent reply other threads:[~2014-05-09 10:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140509103937.GC7950@arm.com \
--to=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).