From d2bf22865663c260c9eb4ca2cba63dbac9e258f9 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@netfilter.org>
Date: Fri, 1 Nov 2019 15:40:33 +0100
Subject: Fix compatibility support for netlink extended ACK and add
 synchronize_rcu_bh() checking

---
 kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'kernel/include')

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 415104d..5f12ad8 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -48,6 +48,7 @@
 #@HAVE_TYPEDEF_SCTP_SCTPHDR_T@ HAVE_TYPEDEF_SCTP_SCTPHDR_T
 #@HAVE_TIMER_SETUP@ HAVE_TIMER_SETUP
 #@HAVE_STRSCPY@ HAVE_STRSCPY
+#@HAVE_SYNCHRONIZE_RCU_BH@ HAVE_SYNCHRONIZE_RCU_BH
 #@HAVE_LOCKDEP_NFNL_IS_HELD@ HAVE_LOCKDEP_NFNL_IS_HELD
 
 #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H
@@ -82,6 +83,10 @@
 #include <linux/version.h>
 #include <linux/netlink.h>
 
+#ifdef HAVE_SYNCHRONIZE_RCU_BH
+#define synchronize_rcu()		synchronize_rcu_bh()
+#endif
+
 #ifndef rcu_dereference_bh
 #define rcu_dereference_bh(p)		rcu_dereference(p)
 #endif
-- 
cgit v1.2.3