diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-12-16 11:43:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-16 11:43:41 +0100 |
| commit | 73a7ac2808fa52bdab1781646568b6f90c3d7034 (patch) | |
| tree | b3a79f3ce811167c37e9c0e65aeb8a7c70bed4c8 /drivers/net/bonding/bond_main.c | |
| parent | Linux 3.13-rc4 (diff) | |
| parent | Merge branches 'doc.2013.12.03a', 'fixes.2013.12.12a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.12a' into HEAD (diff) | |
| download | linux-dev-73a7ac2808fa52bdab1781646568b6f90c3d7034.tar.xz linux-dev-73a7ac2808fa52bdab1781646568b6f90c3d7034.zip | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull v3.14 RCU updates from Paul E. McKenney.
The main changes:
* Update RCU documentation.
* Miscellaneous fixes.
* Add RCU torture scripts.
* Static-analysis improvements.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 398e299ee1bd..698077b2ad0b 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1763,7 +1763,7 @@ static int __bond_release_one(struct net_device *bond_dev, } if (all) { - rcu_assign_pointer(bond->curr_active_slave, NULL); + RCU_INIT_POINTER(bond->curr_active_slave, NULL); } else if (oldcurrent == slave) { /* * Note that we hold RTNL over this sequence, so there |