Merge remote-tracking branch 'scsi/for-next'

[karo-tx-linux.git] / block / blk-softirq.c

diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index ec9e60636f4335c8e6af0617f9fbc61335c9fea5..ce4b8bfd3d279b0e6dc219d722420368bf969b25 100644 (file)
--- 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);
 
                /*