2 files changed, 4 insertions, 5 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index fd4a6a4ce3cd..7b1d6d2b0c1a 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -208,7 +208,7 @@ void ovs_dp_process_received_packet(struct vport *p, struct sk_buff *skb)
         int error;
         int key_len;
 
-        stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
+        stats = this_cpu_ptr(dp->stats_percpu);
 
         /* Extract flow from 'skb' into 'key'. */
         error = ovs_flow_extract(skb, p->port_no, &key, &key_len);
@@ -282,7 +282,7 @@ int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb,
         return 0;
 
 err:
-        stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
+        stats = this_cpu_ptr(dp->stats_percpu);
 
         u64_stats_update_begin(&stats->sync);
         stats->n_lost++;
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 03779e8a2622..70af0bedbac4 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -333,8 +333,7 @@ void ovs_vport_receive(struct vport *vport, struct sk_buff *skb)
 {
         struct vport_percpu_stats *stats;
 
-        stats = per_cpu_ptr(vport->percpu_stats, smp_processor_id());
-
+        stats = this_cpu_ptr(vport->percpu_stats);
         u64_stats_update_begin(&stats->sync);
         stats->rx_packets++;
         stats->rx_bytes += skb->len;
@@ -359,7 +358,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
         if (likely(sent)) {
                 struct vport_percpu_stats *stats;
 
-                stats = per_cpu_ptr(vport->percpu_stats, smp_processor_id());
+                stats = this_cpu_ptr(vport->percpu_stats);
 
                 u64_stats_update_begin(&stats->sync);
                 stats->tx_packets++;