diff options
| author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-12-07 15:35:56 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-12-07 15:35:56 +0100 |
| commit | 8cdb9e6b30a5f9cad924e20febb8a560b232802e (patch) | |
| tree | d40d4fd33ee18d2689a3acd7e3c1faaa429d4df7 | |
| parent | aace20d23ba88bd3caa63feb6c8be20e6bc6893f (diff) | |
Move compiler specific compatibility support to separated file
Kernel compatibility support was broken in 7.9, reported by Ed W.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | kernel/include/linux/jhash.h | 2 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 13 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compiler.h.in | 15 | ||||
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 1 |
6 files changed, 20 insertions, 15 deletions
@@ -20,6 +20,7 @@ Makefile.in Module.symvers modules.order kernel/include/linux/netfilter/ipset/ip_set_compat.h +kernel/include/linux/netfilter/ipset/ip_set_compiler.h /aclocal.m4 /autom4te.cache/ diff --git a/configure.ac b/configure.ac index 1086de3..2f06590 100644 --- a/configure.ac +++ b/configure.ac @@ -851,7 +851,8 @@ dnl Checks for library functions. dnl Generate output AC_CONFIG_FILES([Makefile include/libipset/Makefile lib/Makefile lib/libipset.pc src/Makefile utils/Makefile - kernel/include/linux/netfilter/ipset/ip_set_compat.h]) + kernel/include/linux/netfilter/ipset/ip_set_compat.h + kernel/include/linux/netfilter/ipset/ip_set_compiler.h]) AC_OUTPUT dnl Summary diff --git a/kernel/include/linux/jhash.h b/kernel/include/linux/jhash.h index 8df77ec..d144e33 100644 --- a/kernel/include/linux/jhash.h +++ b/kernel/include/linux/jhash.h @@ -1,6 +1,6 @@ #ifndef _LINUX_JHASH_H #define _LINUX_JHASH_H -#include <linux/netfilter/ipset/ip_set_compat.h> +#include <linux/netfilter/ipset/ip_set_compiler.h> /* jhash.h: Jenkins hash support. * diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index 8f00e6a..bf99bc0 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -519,18 +519,5 @@ static inline void *kvzalloc(size_t size, gfp_t flags) return members; } #endif - -/* Compiler attributes */ -#ifndef __has_attribute -# define __has_attribute(x) __GCC4_has_attribute_##x -# define __GCC4_has_attribute___fallthrough__ 0 -#endif - -#if __has_attribute(__fallthrough__) -# define fallthrough __attribute__((__fallthrough__)) -#else -# define fallthrough do {} while (0) /* fallthrough */ -#endif - #endif /* IP_SET_COMPAT_HEADERS */ #endif /* __IP_SET_COMPAT_H */ diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compiler.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compiler.h.in new file mode 100644 index 0000000..1b392f8 --- /dev/null +++ b/kernel/include/linux/netfilter/ipset/ip_set_compiler.h.in @@ -0,0 +1,15 @@ +#ifndef __IP_SET_COMPILER_H +#define __IP_SET_COMPILER_H + +/* Compiler attributes */ +#ifndef __has_attribute +# define __has_attribute(x) __GCC4_has_attribute_##x +# define __GCC4_has_attribute___fallthrough__ 0 +#endif + +#if __has_attribute(__fallthrough__) +# define fallthrough __attribute__((__fallthrough__)) +#else +# define fallthrough do {} while (0) /* fallthrough */ +#endif +#endif /* __IP_SET_COMPILER_H */ diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index dcbc400..85961fc 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -21,6 +21,7 @@ #include <linux/netfilter/x_tables.h> #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/ipset/ip_set.h> +#include <linux/netfilter/ipset/ip_set_compiler.h> static LIST_HEAD(ip_set_type_list); /* all registered set types */ static DEFINE_MUTEX(ip_set_type_mutex); /* protects ip_set_type_list */ |