From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH] include: don't collide __bitwise definitions in 4.10
Date: Tue, 21 Feb 2017 10:05:25 -0800 [thread overview]
Message-ID: <20170221180525.GG5846@birch.djwong.org> (raw)
Linux 4.10 changed the definition of __bitwise in such a way that
xfsprogs' definition is no longer a strict match for it. This causes
gcc to complain, so only #define it here if the system hasn't already
done it for us.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
include/xfs_arch.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/xfs_arch.h b/include/xfs_arch.h
index 6e3172c..12cd43e 100644
--- a/include/xfs_arch.h
+++ b/include/xfs_arch.h
@@ -25,10 +25,14 @@
#endif
#ifdef __CHECKER__
-#define __bitwise __attribute__((bitwise))
+# ifndef __bitwise
+# define __bitwise __attribute__((bitwise))
+# endif
#define __force __attribute__((force))
#else
-#define __bitwise
+# ifndef __bitwise
+# define __bitwise
+# endif
#define __force
#endif
next reply other threads:[~2017-02-21 18:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 18:05 Darrick J. Wong [this message]
2017-02-21 18:16 ` [PATCH] include: don't collide __bitwise definitions in 4.10 Eric Sandeen
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=20170221180525.GG5846@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.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).