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>,
Chris Zankel <chris@zankel.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Max Filippov <jcmvbkbc@gmail.com>
Subject: linux-next: manual merge of the tip tree with the xtensa tree
Date: Mon, 13 Jan 2014 14:26:42 +1100 [thread overview]
Message-ID: <20140113142642.6e1944155b1db50d2c70abb4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/xtensa/include/asm/barrier.h between commit dbacef090841 ("xtensa:
add SMP support") from the xtensa tree and commit 93ea02bb8435 ("arch:
Clean up asm/barrier.h implementations using asm-generic/barrier.h") from
the tip tree.
I fixed it up (I am pretty sure - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/xtensa/include/asm/barrier.h
index 8e5e5c980a7a,e1ee6b51dfc5..000000000000
--- a/arch/xtensa/include/asm/barrier.h
+++ b/arch/xtensa/include/asm/barrier.h
@@@ -16,16 -13,10 +13,6 @@@
#define rmb() barrier()
#define wmb() mb()
--#ifdef CONFIG_SMP
- #define smp_mb() mb()
- #define smp_rmb() rmb()
- #define smp_wmb() wmb()
- #else
- #define smp_mb() barrier()
- #define smp_rmb() barrier()
- #define smp_wmb() barrier()
-#error smp_* not defined
--#endif
--
- #define set_mb(var, value) do { var = value; mb(); } while (0)
+ #include <asm-generic/barrier.h>
#endif /* _XTENSA_SYSTEM_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-01-13 3:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 3:26 Stephen Rothwell [this message]
2014-01-13 3:38 ` linux-next: manual merge of the tip tree with the xtensa tree czankel
-- strict thread matches above, loose matches on Subject: below --
2019-11-11 3:31 Stephen Rothwell
2019-11-11 10:04 ` Borislav Petkov
2019-11-26 21:33 ` Stephen Rothwell
2014-01-13 3:26 Stephen Rothwell
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=20140113142642.6e1944155b1db50d2c70abb4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chris@zankel.net \
--cc=hpa@zytor.com \
--cc=jcmvbkbc@gmail.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 \
/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).