Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / block / blk-mq-sysfs.c

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 431fdda21737cb91b9a5a0f49fd1c2ccd2cfae7c..4ea4dd8a1eed5a46763fd59f391faad8ff91d3b5 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -416,12 +416,14 @@ void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx)
 static void blk_mq_sysfs_init(struct request_queue *q)
 {
        struct blk_mq_ctx *ctx;
-       int i;
+       int cpu;
 
        kobject_init(&q->mq_kobj, &blk_mq_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)