diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 918c7fd9aeb1f9c662606a754ddfafa511193897..ee130f14d1fc9228214fb7d0acbd3d4f4a85acdd 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3076,6 +3076,12 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
 	if (cfq_class_idle(cfqq))
 		return true;
 
+	/*
+	 * Don't allow a non-RT request to preempt an ongoing RT cfqq timeslice.
+	 */
+	if (cfq_class_rt(cfqq) && !cfq_class_rt(new_cfqq))
+		return false;
+
 	/*
 	 * if the new request is sync, but the currently running queue is
 	 * not, let the sync request have priority.