From: Jens Axboe Date: Thu, 20 Apr 2017 15:37:05 +0000 (-0600) Subject: bfq: fix compile error if CONFIG_CGROUPS=n X-Git-Tag: MMI-PSA29.97-13-9~5704^2~97 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=659b3394eb67a5e274d7e7348633b508510a5c8f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git bfq: fix compile error if CONFIG_CGROUPS=n If we don't have CGROUPS enabled, the compile ends in the following misery: In file included from ../block/bfq-iosched.c:105:0: ../block/bfq-iosched.h:819:22: error: array type has incomplete element type extern struct cftype bfq_blkcg_legacy_files[]; ^ ../block/bfq-iosched.h:820:22: error: array type has incomplete element type extern struct cftype bfq_blkg_files[]; ^ Move the declarations under the right ifdef. Reported-by: Randy Dunlap Signed-off-by: Jens Axboe --- diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 4ce7915e8d84..ae783c06dfd9 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -816,9 +816,6 @@ void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg); /* ---------------- cgroups-support interface ---------------- */ -extern struct cftype bfq_blkcg_legacy_files[]; -extern struct cftype bfq_blkg_files[]; - void bfqg_stats_update_io_add(struct bfq_group *bfqg, struct bfq_queue *bfqq, unsigned int op); void bfqg_stats_update_io_remove(struct bfq_group *bfqg, unsigned int op); @@ -844,6 +841,8 @@ struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node); void bfqg_put(struct bfq_group *bfqg); #ifdef CONFIG_BFQ_GROUP_IOSCHED +extern struct cftype bfq_blkcg_legacy_files[]; +extern struct cftype bfq_blkg_files[]; extern struct blkcg_policy blkcg_policy_bfq; #endif