3 files changed, 8 insertions, 8 deletions

diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
index 4b8d9b541112..1855bf51edb0 100644
--- a/block/blk-iopoll.c
+++ b/block/blk-iopoll.c
@@ -35,7 +35,7 @@ void blk_iopoll_sched(struct blk_iopoll *iop)
         unsigned long flags;
 
         local_irq_save(flags);
-        list_add_tail(&iop->list, &__get_cpu_var(blk_cpu_iopoll));
+        list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
         __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ);
         local_irq_restore(flags);
 }
@@ -79,7 +79,7 @@ EXPORT_SYMBOL(blk_iopoll_complete);
 
 static void blk_iopoll_softirq(struct softirq_action *h)
 {
-        struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
+        struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
         int rearm = 0, budget = blk_iopoll_budget;
         unsigned long start_time = jiffies;
 
@@ -201,7 +201,7 @@ static int blk_iopoll_cpu_notify(struct notifier_block *self,
 
                 local_irq_disable();
                 list_splice_init(&per_cpu(blk_cpu_iopoll, cpu),
-                                 &__get_cpu_var(blk_cpu_iopoll));
+                                 this_cpu_ptr(&blk_cpu_iopoll));
                 __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ);
                 local_irq_enable();
         }
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index ec9e60636f43..ce4b8bfd3d27 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -23,7 +23,7 @@ static void blk_done_softirq(struct softirq_action *h)
         struct list_head *cpu_list, local_list;
 
         local_irq_disable();
-        cpu_list = &__get_cpu_var(blk_cpu_done);
+        cpu_list = this_cpu_ptr(&blk_cpu_done);
         list_replace_init(cpu_list, &local_list);
         local_irq_enable();
 
@@ -44,7 +44,7 @@ static void trigger_softirq(void *data)
         struct list_head *list;
 
         local_irq_save(flags);
-        list = &__get_cpu_var(blk_cpu_done);
+        list = this_cpu_ptr(&blk_cpu_done);
         list_add_tail(&rq->csd.list, list);
 
         if (list->next == &rq->csd.list)
@@ -90,7 +90,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
 
                 local_irq_disable();
                 list_splice_init(&per_cpu(blk_cpu_done, cpu),
-                                 &__get_cpu_var(blk_cpu_done));
+                                 this_cpu_ptr(&blk_cpu_done));
                 raise_softirq_irqoff(BLOCK_SOFTIRQ);
                 local_irq_enable();
         }
@@ -135,7 +135,7 @@ void __blk_complete_request(struct request *req)
         if (ccpu == cpu || shared) {
                 struct list_head *list;
 do_local:
-                list = &__get_cpu_var(blk_cpu_done);
+                list = this_cpu_ptr(&blk_cpu_done);
                 list_add_tail(&req->csd.list, list);
 
                 /*
diff --git a/fs/fscache/object.c b/fs/fscache/object.c
index 86d75a60b20c..3b0712213993 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -796,7 +796,7 @@ void fscache_enqueue_object(struct fscache_object *object)
  */
 bool fscache_object_sleep_till_congested(signed long *timeoutp)
 {
-        wait_queue_head_t *cong_wq = &__get_cpu_var(fscache_object_cong_wait);
+        wait_queue_head_t *cong_wq = this_cpu_ptr(&fscache_object_cong_wait);
         DEFINE_WAIT(wait);
 
         if (fscache_object_congested())