[PATCH] BLOCK: Remove duplicate declaration of exit_io_context() [try #6]

Remove the duplicate declaration of exit_io_context() from linux/sched.h.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index a06fc89cf6e5b8778c93ca53ebbb733948448948..fc4a9873ec10fb5cdb603671fc0d266f9ecd1646 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -710,7 +710,6 @@ extern unsigned int max_cache_size;
 
 
 struct io_context;                     /* See blkdev.h */
-void exit_io_context(void);
 struct cpuset;
 
 #define NGROUPS_SMALL          32

diff --git a/kernel/exit.c b/kernel/exit.c
index 2e4c13cba95ae7af79bc373a859ecac42a340225..c189de2927ab6b55ab47baf199d347d65481e906 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -38,6 +38,7 @@
 #include <linux/pipe_fs_i.h>
 #include <linux/audit.h> /* for audit_free() */
 #include <linux/resource.h>
+#include <linux/blkdev.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>