From da4d5e5ba603c820272a64fc2ca8a3e17acf4df7 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 30 Jun 2008 20:42:08 +0200
Subject: [PATCH] --- yaml --- r: 98897 b: refs/heads/master c:
 da9cbc87395308a21465bd25441297bbba0477e1 h: refs/heads/master i:   98895:
 64f1c2b3b4b3ca04e08c38971f5cd25afa927ab7 v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/blkdev.h    | 17 -----------------
 trunk/include/linux/iocontext.h | 18 ++++++++++++++++++
 trunk/kernel/exit.c             |  1 +
 trunk/kernel/fork.c             |  1 +
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index a005c7abc72d..25a2274c62fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b984679efe1a616ec4ac919dba08286d71593900
+refs/heads/master: da9cbc87395308a21465bd25441297bbba0477e1
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 4a9ed45270ff..443df75d2cde 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -33,12 +33,6 @@ struct sg_io_hdr;
 #define BLKDEV_MIN_RQ	4
 #define BLKDEV_MAX_RQ	128	/* Default maximum */
 
-int put_io_context(struct io_context *ioc);
-void exit_io_context(void);
-struct io_context *get_io_context(gfp_t gfp_flags, int node);
-struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
-void copy_io_context(struct io_context **pdst, struct io_context **psrc);
-
 struct request;
 typedef void (rq_end_io_fn)(struct request *, int);
 
@@ -981,17 +975,6 @@ static inline long nr_blockdev_pages(void)
 	return 0;
 }
 
-static inline void exit_io_context(void)
-{
-}
-
-struct io_context;
-static inline int put_io_context(struct io_context *ioc)
-{
-	return 1;
-}
-
-
 #endif /* CONFIG_BLOCK */
 
 #endif
diff --git a/trunk/include/linux/iocontext.h b/trunk/include/linux/iocontext.h
index 2b7a1187cb29..08b987bccf89 100644
--- a/trunk/include/linux/iocontext.h
+++ b/trunk/include/linux/iocontext.h
@@ -99,4 +99,22 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)
 	return NULL;
 }
 
+#ifdef CONFIG_BLOCK
+int put_io_context(struct io_context *ioc);
+void exit_io_context(void);
+struct io_context *get_io_context(gfp_t gfp_flags, int node);
+struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
+void copy_io_context(struct io_context **pdst, struct io_context **psrc);
+#else
+static inline void exit_io_context(void)
+{
+}
+
+struct io_context;
+static inline int put_io_context(struct io_context *ioc)
+{
+	return 1;
+}
+#endif
+
 #endif
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 8f6185e69b69..ceb258782835 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -13,6 +13,7 @@
 #include <linux/personality.h>
 #include <linux/tty.h>
 #include <linux/mnt_namespace.h>
+#include <linux/iocontext.h>
 #include <linux/key.h>
 #include <linux/security.h>
 #include <linux/cpu.h>
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 19908b26cf80..b71ccd09fc8d 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -23,6 +23,7 @@
 #include <linux/sem.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
+#include <linux/iocontext.h>
 #include <linux/key.h>
 #include <linux/binfmts.h>
 #include <linux/mman.h>