lkml.org 
[lkml]   [2017]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: linux-next: Tree for Apr 20 (bfq)
From
Date
On 04/20/2017 09:24 AM, Randy Dunlap wrote:
> On 04/19/17 23:43, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20170419:
>>
>
> on i386:
> when CONFIG_CGROUPS is not enabled:
>
> 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[];

This should fix it:


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

--
Jens Axboe

\
 
 \ /
  Last update: 2017-04-20 17:37    [W:0.252 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site