diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-10-31 09:33:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-10-31 09:33:19 +0100 |
| commit | 43e0ae7ae0f567a3f8c10ec7a4078bc482660921 (patch) | |
| tree | f44975fcd01ee1a6c5f519bf0456e1547a5e3752 /net/sched/act_ife.c | |
| parent | Merge tag 'iommu-fixes-v5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Merge branches 'doc.2019.10.29a', 'fixes.2019.10.30a', 'nohz.2019.10.28a', 'r... (diff) | |
| download | linux-43e0ae7ae0f567a3f8c10ec7a4078bc482660921.tar.xz linux-43e0ae7ae0f567a3f8c10ec7a4078bc482660921.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU and LKMM changes from Paul E. McKenney:
- Documentation updates.
- Miscellaneous fixes.
- Dynamic tick (nohz) updates, perhaps most notably changes to
force the tick on when needed due to lengthy in-kernel execution
on CPUs on which RCU is waiting.
- Replace rcu_swap_protected() with rcu_prepace_pointer().
- Torture-test updates.
- Linux-kernel memory consistency model updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/sched/act_ife.c')
| -rw-r--r-- | net/sched/act_ife.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c index 3a31e241c647..2ea2e164e3bd 100644 --- a/net/sched/act_ife.c +++ b/net/sched/act_ife.c @@ -594,7 +594,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, spin_lock_bh(&ife->tcf_lock); /* protected by tcf_lock when modifying existing action */ goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch); - rcu_swap_protected(ife->params, p, 1); + p = rcu_replace_pointer(ife->params, p, 1); if (exists) spin_unlock_bh(&ife->tcf_lock); |