diff --git a/[refs] b/[refs] index 36a95a9ca194..444cf0f0bae6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b07de85a76e1346e675f0e98437378932473df7 +refs/heads/master: c265a7f41706cee20508de5b4a919214cfd7a11b diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 0ebb626a25d3..1e2aff812ee2 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1731,7 +1731,7 @@ cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq, if (!cfq_cfqq_sync(cfqq) || cfq_class_idle(cfqq)) return; - old_idle = cfq_cfqq_idle_window(cfqq); + enable_idle = old_idle = cfq_cfqq_idle_window(cfqq); if (!atomic_read(&cic->ioc->nr_tasks) || !cfqd->cfq_slice_idle || (cfqd->hw_tag && CIC_SEEKY(cic)))