From 68ade8303ff94cc10586298997a0474b513ddc61 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 27 Nov 2014 17:54:52 +0100 Subject: Remove unnecessary integer RCU handling and fix sparse warnings --- kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'kernel/include/linux/netfilter/ipset/ip_set_compat.h.in') 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 862504b..375a18a 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -53,13 +53,25 @@ #endif #ifndef rcu_dereference_protected -#define rcu_dereference_protected(p, c) rcu_dereference(p) +#define rcu_dereference_protected(p, c) (p) +#endif + +#ifndef rcu_dereference_bh_check +#define rcu_dereference_bh_check(p, c) rcu_dereference_bh(p) #endif #ifndef __rcu #define __rcu #endif +#ifndef RCU_INITIALIZER +#define RCU_INITIALIZER(v) (typeof(*(v)) __force __rcu *)(v) +#define RCU_INIT_POINTER(p, v) \ + do { \ + p = RCU_INITIALIZER(v); \ + } while (0) +#endif + #ifdef CHECK_KCONFIG #ifndef CONFIG_SPARSE_RCU_POINTER #error "CONFIG_SPARSE_RCU_POINTER must be enabled" -- cgit v1.2.3