From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Mon, 19 Oct 2015 17:58:35 +0000 (+0200)
Subject: Protect definition of RCU_INIT_POINTER in compatibility header file
X-Git-Tag: v6.27~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=095bd886850f3f0c6fa98f2a8d2433f9240b37f0;p=thirdparty%2Fipset.git

Protect definition of RCU_INIT_POINTER in compatibility header file

Nikolay Borisov reported that in 3.12.47 RCU_INIT_POINTER is redefined
in ip_set_compat.h.in due to not protecting it individually.
---

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 8c0b3467..aa93c2cb 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -67,14 +67,18 @@
 
 #ifndef __rcu
 #define	__rcu
+#ifndef RCU_INIT_POINTER
 #define RCU_INIT_POINTER(p, v) \
 	do { \
 		p = v; \
 	} while (0)
+#endif
 #else
 
 #ifndef RCU_INITIALIZER
 #define RCU_INITIALIZER(v)	(typeof(*(v)) __force __rcu *)(v)
+#endif
+#ifndef RCU_INIT_POINTER
 #define RCU_INIT_POINTER(p, v)	\
 	do { \
 		p = RCU_INITIALIZER(v); \