diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-04-18 14:42:24 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-04-18 14:42:24 +0200 |
commit | 94e4dcc75a47253c75084524e15735585cd220a1 (patch) | |
tree | e2a3077eb4009982fea3708576bb5f163ea4a20c /net | |
parent | e53f31bffe1d552f496b674cd1733658a268e177 (diff) | |
parent | 91df49e187c1a111e423fe0c3aec3472980385e4 (diff) |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU and LKMM commits from Paul E. McKenney:
- An LKMM commit adding support for synchronize_srcu_expedited()
- A couple of straggling RCU flavor consolidation updates
- Documentation updates.
- Miscellaneous fixes
- SRCU updates
- RCU CPU stall-warning updates
- Torture-test updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index 835d50b279f5..a2a88ab07f7b 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c @@ -56,7 +56,7 @@ struct clusterip_config { #endif enum clusterip_hashmode hash_mode; /* which hashing mode */ u_int32_t hash_initval; /* hash initialization */ - struct rcu_head rcu; /* for call_rcu_bh */ + struct rcu_head rcu; /* for call_rcu */ struct net *net; /* netns for pernet list */ char ifname[IFNAMSIZ]; /* device ifname */ }; |