From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Will Deacon <will.deacon@arm.com>
Subject: linux-next: manual merge of the tip tree with the arm64 tree
Date: Tue, 13 Oct 2015 13:10:48 +1100 [thread overview]
Message-ID: <20151013131048.51f00118@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/include/asm/atomic.h
between commit:
305d454aaa29 ("arm64: atomics: implement native {relaxed, acquire, release} atomics")
from the arm64 tree and commit:
62e8a3258bda ("atomic, arch: Audit atomic_{read,set}()")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm64/include/asm/atomic.h
index 5e13ad76a249,1e247ac2601a..000000000000
--- a/arch/arm64/include/asm/atomic.h
+++ b/arch/arm64/include/asm/atomic.h
@@@ -54,39 -54,8 +54,39 @@@
#define ATOMIC_INIT(i) { (i) }
#define atomic_read(v) READ_ONCE((v)->counter)
- #define atomic_set(v, i) (((v)->counter) = (i))
+ #define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i))
+
+#define atomic_add_return_relaxed atomic_add_return_relaxed
+#define atomic_add_return_acquire atomic_add_return_acquire
+#define atomic_add_return_release atomic_add_return_release
+#define atomic_add_return atomic_add_return
+
+#define atomic_inc_return_relaxed(v) atomic_add_return_relaxed(1, (v))
+#define atomic_inc_return_acquire(v) atomic_add_return_acquire(1, (v))
+#define atomic_inc_return_release(v) atomic_add_return_release(1, (v))
+#define atomic_inc_return(v) atomic_add_return(1, (v))
+
+#define atomic_sub_return_relaxed atomic_sub_return_relaxed
+#define atomic_sub_return_acquire atomic_sub_return_acquire
+#define atomic_sub_return_release atomic_sub_return_release
+#define atomic_sub_return atomic_sub_return
+
+#define atomic_dec_return_relaxed(v) atomic_sub_return_relaxed(1, (v))
+#define atomic_dec_return_acquire(v) atomic_sub_return_acquire(1, (v))
+#define atomic_dec_return_release(v) atomic_sub_return_release(1, (v))
+#define atomic_dec_return(v) atomic_sub_return(1, (v))
+
+#define atomic_xchg_relaxed(v, new) xchg_relaxed(&((v)->counter), (new))
+#define atomic_xchg_acquire(v, new) xchg_acquire(&((v)->counter), (new))
+#define atomic_xchg_release(v, new) xchg_release(&((v)->counter), (new))
#define atomic_xchg(v, new) xchg(&((v)->counter), (new))
+
+#define atomic_cmpxchg_relaxed(v, old, new) \
+ cmpxchg_relaxed(&((v)->counter), (old), (new))
+#define atomic_cmpxchg_acquire(v, old, new) \
+ cmpxchg_acquire(&((v)->counter), (old), (new))
+#define atomic_cmpxchg_release(v, old, new) \
+ cmpxchg_release(&((v)->counter), (old), (new))
#define atomic_cmpxchg(v, old, new) cmpxchg(&((v)->counter), (old), (new))
#define atomic_inc(v) atomic_add(1, (v))
next reply other threads:[~2015-10-13 2:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-13 2:10 Stephen Rothwell [this message]
2015-10-13 9:50 ` linux-next: manual merge of the tip tree with the arm64 tree Will Deacon
-- strict thread matches above, loose matches on Subject: below --
2021-12-13 16:45 broonie
2021-08-27 4:09 Stephen Rothwell
2020-05-22 6:11 Stephen Rothwell
2020-03-18 4:27 Stephen Rothwell
2020-03-18 8:50 ` Catalin Marinas
2020-03-10 1:49 Stephen Rothwell
2019-04-15 4:25 Stephen Rothwell
2019-04-15 4:21 Stephen Rothwell
2017-11-01 5:47 Stephen Rothwell
2017-11-13 22:52 ` Stephen Rothwell
2017-08-22 3:38 Stephen Rothwell
2017-09-04 5:29 ` Stephen Rothwell
2017-06-16 3:25 Stephen Rothwell
2017-07-03 1:29 ` Stephen Rothwell
2017-03-31 3:02 Stephen Rothwell
2017-03-31 9:32 ` Arnd Bergmann
2017-03-31 11:24 ` Stephen Rothwell
2016-09-12 2:54 Stephen Rothwell
2016-05-12 2:00 Stephen Rothwell
2016-04-29 3:56 Stephen Rothwell
2016-04-29 9:04 ` Matt Fleming
2016-02-26 1:53 Stephen Rothwell
2016-02-26 1:53 Stephen Rothwell
2015-10-22 2:26 Stephen Rothwell
2015-10-22 12:06 ` Suzuki K. Poulose
2015-10-22 15:32 ` Catalin Marinas
2015-10-31 22:17 ` Stephen Rothwell
2015-10-15 3:05 Stephen Rothwell
2014-05-23 6:44 Stephen Rothwell
2014-05-23 9:23 ` Catalin Marinas
2014-05-23 6:28 Stephen Rothwell
2014-05-23 8:41 ` Catalin Marinas
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=20151013131048.51f00118@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=catalin.marinas@arm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
/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).