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>

diff --git a/.gitignore b/.gitignore
index 46a78ddd2f108a9cceca1be46446637978d36836..0e8a087ee198cfda8c956539539f81489e7a9fb3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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 1086de34f58a394f781758aaa56eb7ae707b6683..2f065909dade45341566ef7834c96e0594162d99 100644 (file)
--- 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 8df77ec98cfc4385e0718fa87ed614c05a380973..d144e3312356b3a26916e68eb560418c6ec26c3b 100644 (file)
--- 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 8f00e6a280b93c827fe4c5248e3fbf655c8d21ef..bf99bc0f18c98a152103a27b8938e60dcd85aa56 100644 (file)
--- 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 (file)
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 dcbc4008c00d7b9623ce09f3262c78cf38e51d81..85961fc33111d96c8cf4b3e0ef5d255613394c4e 100644 (file)
--- 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 */