diff options
author | Jens Axboe <axboe@fb.com> | 2014-05-28 09:50:26 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-05-28 09:50:26 -0600 |
commit | 6178976500ae61fa7b12ebb2d3de816dc9396388 (patch) | |
tree | 143df1479f56458801b676d038e6a7157a472981 /block/cfq-iosched.c | |
parent | 6314a108ec19aefa5160535b2bfe1ca9c38efe37 (diff) | |
parent | d852564f8c88b0604490234fdeeb6fb47e4bcc7a (diff) | |
download | blackbird-op-linux-6178976500ae61fa7b12ebb2d3de816dc9396388.tar.gz blackbird-op-linux-6178976500ae61fa7b12ebb2d3de816dc9396388.zip |
Merge branch 'for-3.16/core' into for-3.16/drivers
mtip32xx uses blk_mq_alloc_reserved_request(), so pull in the
core changes so we have a properly merged end result.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 5063a0bd831a..22dffebc7c73 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -4460,7 +4460,7 @@ out_free: static ssize_t cfq_var_show(unsigned int var, char *page) { - return sprintf(page, "%d\n", var); + return sprintf(page, "%u\n", var); } static ssize_t |