diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-09-21 13:55:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-21 13:55:11 +0200 |
| commit | 7ed569206ebe7467b9c912b857ec46cf1c361111 (patch) | |
| tree | c3e0b92cc782439c33ae844e2520819a29700897 /net/core/dev.c | |
| parent | perf: Undo the per cpu-context timer stuff (diff) | |
| parent | Linux 2.6.36-rc5 (diff) | |
| download | linux-dev-7ed569206ebe7467b9c912b857ec46cf1c361111.tar.xz linux-dev-7ed569206ebe7467b9c912b857ec46cf1c361111.zip | |
Merge commit 'v2.6.36-rc5' into perf/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 561ee3a86525..7ec85e27beed 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4853,7 +4853,7 @@ static void rollback_registered_many(struct list_head *head) dev = list_first_entry(head, struct net_device, unreg_list); call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev); - synchronize_net(); + rcu_barrier(); list_for_each_entry(dev, head, unreg_list) dev_put(dev); |