* [PATCH] include: don't collide __bitwise definitions in 4.10
@ 2017-02-21 18:05 Darrick J. Wong
2017-02-21 18:16 ` Eric Sandeen
0 siblings, 1 reply; 2+ messages in thread
From: Darrick J. Wong @ 2017-02-21 18:05 UTC (permalink / raw)
To: Eric Sandeen; +Cc: xfs
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] include: don't collide __bitwise definitions in 4.10
2017-02-21 18:05 [PATCH] include: don't collide __bitwise definitions in 4.10 Darrick J. Wong
@ 2017-02-21 18:16 ` Eric Sandeen
0 siblings, 0 replies; 2+ messages in thread
From: Eric Sandeen @ 2017-02-21 18:16 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: xfs
On 2/21/17 12:05 PM, Darrick J. Wong wrote:
> 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>
Makes sense, thanks for catching this.
Reviewed-by: Eric Sandeen <sandeen@redhat.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
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-21 18:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-21 18:05 [PATCH] include: don't collide __bitwise definitions in 4.10 Darrick J. Wong
2017-02-21 18:16 ` Eric Sandeen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.