diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2021-09-28 13:27:40 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-09-28 13:27:40 -0300 |
| commit | d30ef6d5c013c19e907f2a3a3d6eee04fcd3de0d (patch) | |
| tree | 1a29bbb9fd2bf9a0a5cb3589f18865cf2c1d2985 /tools/include/linux/compiler-gcc.h | |
| parent | RDMA/rxe: Remove unused WR_READ_WRITE_OR_SEND_MASK (diff) | |
| parent | IB/mlx5: Enable UAR to have DevX UID (diff) | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Leon Romanovsky says:
====================
This is short series for mlx5 from Meir that adds a DevX UID to the UAR.
====================
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
* mellanox/mlx5-next:
IB/mlx5: Enable UAR to have DevX UID
net/mlx5: Add uid field to UAR allocation structures
Diffstat (limited to 'tools/include/linux/compiler-gcc.h')
| -rw-r--r-- | tools/include/linux/compiler-gcc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/include/linux/compiler-gcc.h b/tools/include/linux/compiler-gcc.h index 95c072b70d0e..8816f06fc6c7 100644 --- a/tools/include/linux/compiler-gcc.h +++ b/tools/include/linux/compiler-gcc.h @@ -16,9 +16,9 @@ # define __fallthrough __attribute__ ((fallthrough)) #endif -#if GCC_VERSION >= 40300 +#if __has_attribute(__error__) # define __compiletime_error(message) __attribute__((error(message))) -#endif /* GCC_VERSION >= 40300 */ +#endif /* &a[0] degrades to a pointer: a different type from an array */ #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) @@ -38,7 +38,3 @@ #endif #define __printf(a, b) __attribute__((format(printf, a, b))) #define __scanf(a, b) __attribute__((format(scanf, a, b))) - -#if GCC_VERSION >= 50100 -#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1 -#endif |