1 files changed, 4 insertions, 4 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 41c4e9ce1141..2c6379da295c 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -584,7 +584,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
 }
 EXPORT_SYMBOL(netpoll_parse_options);
 
-int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp)
+int __netpoll_setup(struct netpoll *np, struct net_device *ndev)
 {
         struct netpoll_info *npinfo;
         const struct net_device_ops *ops;
@@ -603,7 +603,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp)
         }
 
         if (!ndev->npinfo) {
-                npinfo = kmalloc(sizeof(*npinfo), gfp);
+                npinfo = kmalloc(sizeof(*npinfo), GFP_KERNEL);
                 if (!npinfo) {
                         err = -ENOMEM;
                         goto out;
@@ -617,7 +617,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp)
 
                 ops = np->dev->netdev_ops;
                 if (ops->ndo_netpoll_setup) {
-                        err = ops->ndo_netpoll_setup(ndev, npinfo, gfp);
+                        err = ops->ndo_netpoll_setup(ndev, npinfo);
                         if (err)
                                 goto free_npinfo;
                 }
@@ -749,7 +749,7 @@ int netpoll_setup(struct netpoll *np)
         /* fill up the skb queue */
         refill_skbs();
 
-        err = __netpoll_setup(np, ndev, GFP_KERNEL);
+        err = __netpoll_setup(np, ndev);
         if (err)
                 goto put;