1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index e30d80033cbc..057b05700f8b 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -658,7 +658,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
  drop:
         dev->stats.tx_dropped++;
-        dev_kfree_skb(skb);
+        dev_kfree_skb_any(skb);
         return NETDEV_TX_OK;
 }
 
@@ -1060,13 +1060,13 @@ static struct rtnl_link_stats64 *xennet_get_stats64(struct net_device *dev,
                 unsigned int start;
 
                 do {
-                        start = u64_stats_fetch_begin_bh(&stats->syncp);
+                        start = u64_stats_fetch_begin_irq(&stats->syncp);
 
                         rx_packets = stats->rx_packets;
                         tx_packets = stats->tx_packets;
                         rx_bytes = stats->rx_bytes;
                         tx_bytes = stats->tx_bytes;
-                } while (u64_stats_fetch_retry_bh(&stats->syncp, start));
+                } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
 
                 tot->rx_packets += rx_packets;
                 tot->tx_packets += tx_packets;
@@ -1282,16 +1282,10 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
         np->rx_refill_timer.function = rx_refill_timeout;
 
         err = -ENOMEM;
-        np->stats = alloc_percpu(struct netfront_stats);
+        np->stats = netdev_alloc_pcpu_stats(struct netfront_stats);
         if (np->stats == NULL)
                 goto exit;
 
-        for_each_possible_cpu(i) {
-                struct netfront_stats *xen_nf_stats;
-                xen_nf_stats = per_cpu_ptr(np->stats, i);
-                u64_stats_init(&xen_nf_stats->syncp);
-        }
-
         /* Initialise tx_skbs as a free chain containing every entry. */
         np->tx_skb_freelist = 0;
         for (i = 0; i < NET_TX_RING_SIZE; i++) {