diff --git a/[refs] b/[refs]
index b51f0918b92d..cd84b82abadf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6203554207728f43cfb9fd48585cd6500da73d42
+refs/heads/master: 7663c1e2792a9662b23dec6e19bfcd3d55360b8f
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 95864b3ff298..d2a1b71e93c3 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -412,8 +412,12 @@ struct request_queue
 
 static inline int queue_is_locked(struct request_queue *q)
 {
+#ifdef CONFIG_SMP
 	spinlock_t *lock = q->queue_lock;
 	return lock && spin_is_locked(lock);
+#else
+	return 1;
+#endif
 }
 
 static inline void queue_flag_set_unlocked(unsigned int flag,