diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-10-19 19:58:35 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-10-19 19:58:35 +0200 |
| commit | 095bd886850f3f0c6fa98f2a8d2433f9240b37f0 (patch) | |
| tree | a8bd82f199487d4bb18a2af33d6147ed69504544 /kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | |
| parent | e3f1193c8293731038bdbe98266636ab67f2a162 (diff) | |
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.
Diffstat (limited to 'kernel/include/linux/netfilter/ipset/ip_set_compat.h.in')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 4 |
1 files changed, 4 insertions, 0 deletions
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 8c0b346..aa93c2c 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); \ |