diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-06-09 13:15:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-06-09 13:15:41 +0800 |
| commit | 965da07af5a118bcd22798f2081dfe6daf361b07 (patch) | |
| tree | 0bbdaa15b5073c2f504b3e66f31a7b208a5c5247 /block | |
| parent | ac05715acc649e5f91c18ae46b8fcac71e755b33 (diff) | |
| parent | 3b8d7f4db34913c8e2ea0177723784b646f7424e (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rt
Conflicts:
include/linux/list.h
kernel/irq/manage.c
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index fa4a617141f5..31eb5ba06de6 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2299,7 +2299,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) if (!req->bio) return false; - trace_block_rq_complete(req->q, req); + trace_block_rq_complete(req->q, req, nr_bytes); /* * For fs requests, rq is just carrier of independent bio's |