UBUNTU: Start new release

[mirror_ubuntu-artful-kernel.git] / block / blk-mq-sysfs.c

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 1cf18784c5cf3c44be94dbd003ca9d7088f883e0..8d41163617dad98f737fbc0d0f21beab9b9f463b 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -413,14 +413,17 @@ static void blk_mq_sysfs_init(struct request_queue *q)
        struct blk_mq_hw_ctx *hctx;
        struct blk_mq_ctx *ctx;
        int i;
+       int cpu;
 
        kobject_init(&q->mq_kobj, &blk_mq_ktype);
 
        queue_for_each_hw_ctx(q, hctx, i)
                kobject_init(&hctx->kobj, &blk_mq_hw_ktype);
 
-       queue_for_each_ctx(q, ctx, i)
+       for_each_possible_cpu(cpu) {
+               ctx = per_cpu_ptr(q->queue_ctx, cpu);
                kobject_init(&ctx->kobj, &blk_mq_ctx_ktype);
+       }
 }
 
 int blk_mq_register_disk(struct gendisk *disk)