diff options
| author | Ming Lei <tom.leiming@gmail.com> | 2014-06-03 11:24:06 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-06-03 21:04:39 -0600 |
| commit | e6cdb0929fe6726ba5203fc5529b74564d98a9e9 (patch) | |
| tree | 349d10c04501a0543c274bcd863d492e35585137 | |
| parent | cb96a42cc1f50ba1c7b1e9b2343bec80b926107f (diff) | |
| download | linux-e6cdb0929fe6726ba5203fc5529b74564d98a9e9.tar.gz linux-e6cdb0929fe6726ba5203fc5529b74564d98a9e9.tar.bz2 linux-e6cdb0929fe6726ba5203fc5529b74564d98a9e9.zip | |
blk-mq: fix sparse warning on missed __percpu annotation
'struct blk_mq_ctx' is __percpu, so add the annotation
and fix the sparse warning reported from Fengguang:
[block:for-linus 2/3] block/blk-mq.h:75:16: sparse: incorrect
type in initializer (different address spaces)
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/blk-mq.c | 2 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 43eb3156e110..3bb4cfec276b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1767,7 +1767,7 @@ static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set, struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) { struct blk_mq_hw_ctx **hctxs; - struct blk_mq_ctx *ctx; + struct blk_mq_ctx __percpu *ctx; struct request_queue *q; unsigned int *map; int i; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 8aba35f46f87..5c6f836afa1b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -335,7 +335,7 @@ struct request_queue { unsigned int *mq_map; /* sw queues */ - struct blk_mq_ctx *queue_ctx; + struct blk_mq_ctx __percpu *queue_ctx; unsigned int nr_queues; /* hw dispatch queues */ |