---

yaml --- r: 94885 b: refs/heads/master c: 7663c1e h: refs/heads/master i: 94883: 1d1f9f2 v: v3
git-mirror · Apr 29, 2008 · 3d282b8 · 3d282b8
1 parent e192e5d
commit 3d282b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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,