From 6ee023d6612feacaedf6b57666151bffa705fe61 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Thu, 31 Aug 2006 12:56:06 +0200
Subject: [PATCH] --- yaml --- r: 37589 b: refs/heads/master c:
 bcfd8d36151e531e1c6c731f1fbf792509a1c494 h: refs/heads/master i:   37587:
 206020359299ff2abade89baef8c639481078c2c v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/blkdev.h | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dc764d9d53a7..60a02c8812b4 100644
--- 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
index 3e36107d342a..1d79b8d4ca6d 100644
--- 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,7 +849,7 @@ 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)
@@ -856,7 +857,9 @@ 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 */