Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1245285 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-10-13 04:20 +0200 |
| Last post | 2015-10-13 12:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the tip tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-13 04:20 +0200
Re: linux-next: manual merge of the tip tree with the arm64 tree Will Deacon <will.deacon@arm.com> - 2015-10-13 12:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-10-13 04:20 +0200 |
| Subject | linux-next: manual merge of the tip tree with the arm64 tree |
| Message-ID | <qiXm2-XV-5@gated-at.bofh.it> |
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))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Will Deacon <will.deacon@arm.com> |
|---|---|
| Date | 2015-10-13 12:00 +0200 |
| Message-ID | <qj4xc-2S2-9@gated-at.bofh.it> |
| In reply to | #1245285 |
On Tue, Oct 13, 2015 at 01:10:48PM +1100, Stephen Rothwell wrote:
> 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))
This is the correct fixup, and matches what I'm carrying locally.
Thanks, Stephen.
Will
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web