8 files changed, 12 insertions, 12 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 6b448881422b..14326935800d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2436,7 +2436,7 @@ static void drain_stock(struct memcg_stock_pcp *stock)
  */
 static void drain_local_stock(struct work_struct *dummy)
 {
-        struct memcg_stock_pcp *stock = &__get_cpu_var(memcg_stock);
+        struct memcg_stock_pcp *stock = this_cpu_ptr(&memcg_stock);
         drain_stock(stock);
         clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags);
 }
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 6917f799412b..d50f17fb9be2 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1298,7 +1298,7 @@ static void memory_failure_work_func(struct work_struct *work)
         unsigned long proc_flags;
         int gotten;
 
-        mf_cpu = &__get_cpu_var(memory_failure_cpu);
+        mf_cpu = this_cpu_ptr(&memory_failure_cpu);
         for (;;) {
                 spin_lock_irqsave(&mf_cpu->lock, proc_flags);
                 gotten = kfifo_get(&mf_cpu->fifo, &entry);
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index a4317da60532..b9b8e8204628 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1623,7 +1623,7 @@ void balance_dirty_pages_ratelimited(struct address_space *mapping)
          * 1000+ tasks, all of them start dirtying pages at exactly the same
          * time, hence all honoured too large initial task->nr_dirtied_pause.
          */
-        p =  &__get_cpu_var(bdp_ratelimits);
+        p =  this_cpu_ptr(&bdp_ratelimits);
         if (unlikely(current->nr_dirtied >= ratelimit))
                 *p = 0;
         else if (unlikely(*p >= ratelimit_pages)) {
@@ -1635,7 +1635,7 @@ void balance_dirty_pages_ratelimited(struct address_space *mapping)
          * short-lived tasks (eg. gcc invocations in a kernel build) escaping
          * the dirty throttling and livelock other long-run dirtiers.
          */
-        p = &__get_cpu_var(dirty_throttle_leaks);
+        p = this_cpu_ptr(&dirty_throttle_leaks);
         if (*p > 0 && current->nr_dirtied < ratelimit) {
                 unsigned long nr_pages_dirtied;
                 nr_pages_dirtied = min(*p, ratelimit - current->nr_dirtied);
diff --git a/mm/slub.c b/mm/slub.c
index 9e288d7c5e6a..fdf0fe4da9a9 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2209,7 +2209,7 @@ static inline void *new_slab_objects(struct kmem_cache *s, gfp_t flags,
 
         page = new_slab(s, flags, node);
         if (page) {
-                c = __this_cpu_ptr(s->cpu_slab);
+                c = raw_cpu_ptr(s->cpu_slab);
                 if (c->page)
                         flush_slab(s, c);
 
@@ -2425,7 +2425,7 @@ redo:
          * and the retrieval of the tid.
          */
         preempt_disable();
-        c = __this_cpu_ptr(s->cpu_slab);
+        c = this_cpu_ptr(s->cpu_slab);
 
         /*
          * The transaction ids are globally unique per cpu and per operation on
@@ -2681,7 +2681,7 @@ redo:
          * during the cmpxchg then the free will succedd.
          */
         preempt_disable();
-        c = __this_cpu_ptr(s->cpu_slab);
+        c = this_cpu_ptr(s->cpu_slab);
 
         tid = c->tid;
         preempt_enable();
diff --git a/mm/swap.c b/mm/swap.c
index c0ed4d65438f..913b99dfbea5 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -441,7 +441,7 @@ void rotate_reclaimable_page(struct page *page)
 
                 page_cache_get(page);
                 local_irq_save(flags);
-                pvec = &__get_cpu_var(lru_rotate_pvecs);
+                pvec = this_cpu_ptr(&lru_rotate_pvecs);
                 if (!pagevec_add(pvec, page))
                         pagevec_move_tail(pvec);
                 local_irq_restore(flags);
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index bf233b283319..ddaf70b21b59 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1496,7 +1496,7 @@ void vfree(const void *addr)
         if (!addr)
                 return;
         if (unlikely(in_interrupt())) {
-                struct vfree_deferred *p = &__get_cpu_var(vfree_deferred);
+                struct vfree_deferred *p = this_cpu_ptr(&vfree_deferred);
                 if (llist_add((struct llist_node *)addr, &p->list))
                         schedule_work(&p->wq);
         } else
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 82ce17ce58c4..376bd2d21482 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -489,7 +489,7 @@ static void refresh_cpu_vm_stats(void)
                         continue;
 
                 if (__this_cpu_read(p->pcp.count))
-                        drain_zone_pages(zone, __this_cpu_ptr(&p->pcp));
+                        drain_zone_pages(zone, this_cpu_ptr(&p->pcp));
 #endif
         }
         fold_diff(global_diff);
@@ -1230,7 +1230,7 @@ int sysctl_stat_interval __read_mostly = HZ;
 static void vmstat_update(struct work_struct *w)
 {
         refresh_cpu_vm_stats();
-        schedule_delayed_work(&__get_cpu_var(vmstat_work),
+        schedule_delayed_work(this_cpu_ptr(&vmstat_work),
                 round_jiffies_relative(sysctl_stat_interval));
 }
 
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 36b4591a7a2d..5ae5d85b629d 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1082,7 +1082,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
         class = &pool->size_class[class_idx];
         off = obj_idx_to_offset(page, obj_idx, class->size);
 
-        area = &__get_cpu_var(zs_map_area);
+        area = this_cpu_ptr(&zs_map_area);
         if (off + class->size <= PAGE_SIZE)
                 kunmap_atomic(area->vm_addr);
         else {