mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
blkio: Fix compile errors
Fixes compile errors in blk-cgroup code for empty_time stat and a merge fix in CFQ. The first error was when CONFIG_DEBUG_CFQ_IOSCHED is not set. Signed-off-by: Divyesh Shah <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
4facdaec1c
commit
28baf44299
2 changed files with 28 additions and 28 deletions
|
|
@ -2231,7 +2231,7 @@ static int cfq_forced_dispatch(struct cfq_data *cfqd)
|
|||
int dispatched = 0;
|
||||
|
||||
/* Expire the timeslice of the current active queue first */
|
||||
cfq_slice_expired(cfqd, 0);
|
||||
cfq_slice_expired(cfqd, 0, true);
|
||||
while ((cfqq = cfq_get_next_queue_forced(cfqd)) != NULL) {
|
||||
__cfq_set_active_queue(cfqd, cfqq);
|
||||
dispatched += __cfq_forced_dispatch_cfqq(cfqq);
|
||||
|
|
|
|||
Loading…
Reference in a new issue