Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

[thirdparty/kernel/linux.git] / net / core / netpoll.c

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 2b9fdbc43205f3d8cf826b2074493aa5e72401fb..464f0ff46c22b7716811731b8b85d31990190183 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -801,7 +801,7 @@ void __netpoll_cleanup(struct netpoll *np)
                        ops->ndo_netpoll_cleanup(np->dev);
 
                RCU_INIT_POINTER(np->dev->npinfo, NULL);
-               call_rcu_bh(&npinfo->rcu, rcu_cleanup_netpoll_info);
+               call_rcu(&npinfo->rcu, rcu_cleanup_netpoll_info);
        } else
                RCU_INIT_POINTER(np->dev->npinfo, NULL);
 }
@@ -812,7 +812,7 @@ void __netpoll_free(struct netpoll *np)
        ASSERT_RTNL();
 
        /* Wait for transmitting packets to finish before freeing. */
-       synchronize_rcu_bh();
+       synchronize_rcu();
        __netpoll_cleanup(np);
        kfree(np);
 }