1 files changed, 3 insertions, 3 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();
         }