diff --git a/[refs] b/[refs]
index f16d309d0ac0..a9e75a23f80b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae30c286553c91c49af5cbc0265a05a6543d0c52
+refs/heads/master: c04645e592d4dd60c58def40c913699d4c806727
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 063dcbb714e7..08b057b1b3b2 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -3314,7 +3314,8 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
 			 * only if we processed at least one !rq_noidle request
 			 */
 			if (cfqd->serving_type == SYNC_WORKLOAD
-			    || cfqd->noidle_tree_requires_idle)
+			    || cfqd->noidle_tree_requires_idle
+			    || cfqq->cfqg->nr_cfqq == 1)
 				cfq_arm_slice_timer(cfqd);
 		}
 	}