diff --git a/[refs] b/[refs]
index fc61445e9c3d..f5941535368b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80b15c7389caa81a3860f9fc2ee47ec0ea572a63
+refs/heads/master: e36f724b4ae70e443a7d152929b60059cbfa1a26
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 6df2b5056b51..0abce473d606 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -1097,7 +1097,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)
 	struct elevator_type *__e;
 	int len = 0;
 
-	if (!q->elevator)
+	if (!q->elevator || !blk_queue_stackable(q))
 		return sprintf(name, "none\n");
 
 	elv = e->elevator_type;