---

yaml --- r: 37589 b: refs/heads/master c: bcfd8d3 h: refs/heads/master i: 37587: 2060203 v: v3
git-mirror · Sep 30, 2006 · 6ee023d · 6ee023d
1 parent 1de44e7
commit 6ee023d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e6d12b2c8be2cac099df6dcb8b26884f24d2621
+refs/heads/master: bcfd8d36151e531e1c6c731f1fbf792509a1c494
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_BLKDEV_H
 #define _LINUX_BLKDEV_H
 
+#include <linux/sched.h>
 #include <linux/major.h>
 #include <linux/genhd.h>
 #include <linux/list.h>
@@ -848,15 +849,17 @@ void kblockd_flush(void);
 
 static inline long blk_congestion_wait(int rw, long timeout)
 {
-	return timeout;
+	return io_schedule_timeout(timeout);
 }
 
 static inline long nr_blockdev_pages(void)
 {
 	return 0;
 }
 
-static inline void exit_io_context(void) {}
+static inline void exit_io_context(void)
+{
+}
 
 #endif /* CONFIG_BLOCK */