3 files changed, 9 insertions, 9 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index b65a5051361f..9ef13ff354fe 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2153,7 +2153,7 @@ static inline void __netif_reschedule(struct Qdisc *q)
         unsigned long flags;
 
         local_irq_save(flags);
-        sd = &__get_cpu_var(softnet_data);
+        sd = this_cpu_ptr(&softnet_data);
         q->next_sched = NULL;
         *sd->output_queue_tailp = q;
         sd->output_queue_tailp = &q->next_sched;
@@ -3195,7 +3195,7 @@ static void rps_trigger_softirq(void *data)
 static int rps_ipi_queued(struct softnet_data *sd)
 {
 #ifdef CONFIG_RPS
-        struct softnet_data *mysd = &__get_cpu_var(softnet_data);
+        struct softnet_data *mysd = this_cpu_ptr(&softnet_data);
 
         if (sd != mysd) {
                 sd->rps_ipi_next = mysd->rps_ipi_list;
@@ -3222,7 +3222,7 @@ static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen)
         if (qlen < (netdev_max_backlog >> 1))
                 return false;
 
-        sd = &__get_cpu_var(softnet_data);
+        sd = this_cpu_ptr(&softnet_data);
 
         rcu_read_lock();
         fl = rcu_dereference(sd->flow_limit);
@@ -3369,7 +3369,7 @@ EXPORT_SYMBOL(netif_rx_ni);
 
 static void net_tx_action(struct softirq_action *h)
 {
-        struct softnet_data *sd = &__get_cpu_var(softnet_data);
+        struct softnet_data *sd = this_cpu_ptr(&softnet_data);
 
         if (sd->completion_queue) {
                 struct sk_buff *clist;
@@ -3794,7 +3794,7 @@ EXPORT_SYMBOL(netif_receive_skb);
 static void flush_backlog(void *arg)
 {
         struct net_device *dev = arg;
-        struct softnet_data *sd = &__get_cpu_var(softnet_data);
+        struct softnet_data *sd = this_cpu_ptr(&softnet_data);
         struct sk_buff *skb, *tmp;
 
         rps_lock(sd);
@@ -4301,7 +4301,7 @@ void __napi_schedule(struct napi_struct *n)
         unsigned long flags;
 
         local_irq_save(flags);
-        ____napi_schedule(&__get_cpu_var(softnet_data), n);
+        ____napi_schedule(this_cpu_ptr(&softnet_data), n);
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__napi_schedule);
@@ -4422,7 +4422,7 @@ EXPORT_SYMBOL(netif_napi_del);
 
 static void net_rx_action(struct softirq_action *h)
 {
-        struct softnet_data *sd = &__get_cpu_var(softnet_data);
+        struct softnet_data *sd = this_cpu_ptr(&softnet_data);
         unsigned long time_limit = jiffies + 2;
         int budget = netdev_budget;
         void *have;
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 50f9a9db5792..252e155c837b 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -146,7 +146,7 @@ static void trace_drop_common(struct sk_buff *skb, void *location)
         unsigned long flags;
 
         local_irq_save(flags);
-        data = &__get_cpu_var(dm_cpu_data);
+        data = this_cpu_ptr(&dm_cpu_data);
         spin_lock(&data->lock);
         dskb = data->skb;
 
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 163b673f9e62..adfc7ee1acf2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -345,7 +345,7 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
         unsigned long flags;
 
         local_irq_save(flags);
-        nc = &__get_cpu_var(netdev_alloc_cache);
+        nc = this_cpu_ptr(&netdev_alloc_cache);
         if (unlikely(!nc->frag.page)) {
 refill:
                 for (order = NETDEV_FRAG_PAGE_MAX_ORDER; ;) {