diff --git a/[refs] b/[refs]
index 6d4417ade044..50a8770eb3b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 237e5bc4e51813e9d8ba9da0f63e7acc608882d7
+refs/heads/master: 3c764b7a654668dd04905841d6024f7b6aa843a5
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 43ec3340cb58..b00ca4c86e25 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -1796,7 +1796,8 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 		return false;
 
 	/* We do for queues that were marked with idle window flag. */
-	if (cfq_cfqq_idle_window(cfqq))
+	if (cfq_cfqq_idle_window(cfqq) &&
+	   !(blk_queue_nonrot(cfqd->queue) && cfqd->hw_tag))
 		return true;
 
 	/*