diff --git a/[refs] b/[refs]
index eb1888023700..1d2d72862acc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05c30b9551f1904d9950ad0d28e65fc4ff3c8a8e
+refs/heads/master: 9fa73472ddbcd3da87d35a7f4566eaaf345f798e
diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c
index 27a06e00eaec..7490b6da2453 100644
--- a/trunk/block/blk-ioc.c
+++ b/trunk/block/blk-ioc.c
@@ -204,7 +204,9 @@ void put_io_context(struct io_context *ioc, struct request_queue *locked_q)
 				spin_unlock(last_q->queue_lock);
 			last_q = NULL;
 
-			if (!spin_trylock(this_q->queue_lock))
+			/* spin_trylock() always successes in UP case */
+			if (this_q != locked_q &&
+			    !spin_trylock(this_q->queue_lock))
 				break;
 			last_q = this_q;
 			continue;