2 files changed, 9 insertions, 20 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2fee00a4c9ef..d0ea760ce419 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -171,7 +171,7 @@ MODULE_PARM_DESC(resend_igmp, "Number of IGMP membership reports to send on link
 /*----------------------------- Global variables ----------------------------*/
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-cpumask_var_t netpoll_block_tx;
+atomic_t netpoll_block_tx = ATOMIC_INIT(0);
 #endif
 
 static const char * const version =
@@ -5299,13 +5299,6 @@ static int __init bonding_init(void)
         if (res)
                 goto out;
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        if (!alloc_cpumask_var(&netpoll_block_tx, GFP_KERNEL)) {
-                res = -ENOMEM;
-                goto out;
-        }
-#endif
-
         res = register_pernet_subsys(&bond_net_ops);
         if (res)
                 goto out;
@@ -5334,9 +5327,6 @@ err:
         rtnl_link_unregister(&bond_link_ops);
 err_link:
         unregister_pernet_subsys(&bond_net_ops);
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        free_cpumask_var(netpoll_block_tx);
-#endif
         goto out;
 
 }
@@ -5353,7 +5343,10 @@ static void __exit bonding_exit(void)
         unregister_pernet_subsys(&bond_net_ops);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        free_cpumask_var(netpoll_block_tx);
+        /*
+         * Make sure we don't have an imbalance on our netpoll blocking
+         */
+        WARN_ON(atomic_read(&netpoll_block_tx));
 #endif
 }
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 4eedb12df6ca..c2f081352a03 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -119,26 +119,22 @@
 
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-extern cpumask_var_t netpoll_block_tx;
+extern atomic_t netpoll_block_tx;
 
 static inline void block_netpoll_tx(void)
 {
-        preempt_disable();
-        BUG_ON(cpumask_test_and_set_cpu(smp_processor_id(),
-                                        netpoll_block_tx));
+        atomic_inc(&netpoll_block_tx);
 }
 
 static inline void unblock_netpoll_tx(void)
 {
-        BUG_ON(!cpumask_test_and_clear_cpu(smp_processor_id(),
-                                           netpoll_block_tx));
-        preempt_enable();
+        atomic_dec(&netpoll_block_tx);
 }
 
 static inline int is_netpoll_tx_blocked(struct net_device *dev)
 {
         if (unlikely(dev->priv_flags & IFF_IN_NETPOLL))
-                return cpumask_test_cpu(smp_processor_id(), netpoll_block_tx);
+                return atomic_read(&netpoll_block_tx);
         return 0;
 }
 #else