summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-08-29 19:05:56 +0100
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-09-30 20:31:20 +0200
commit0d67a46df0125e20d14f12dbd3646f1f1bf23e8c (patch)
tree8e823eedbc068e3a1ed3a4af6696a43a48fffa0a
parentcf9a2ae8d49948f861b56e5333530e491a9da190 (diff)
downloadblackbird-op-linux-0d67a46df0125e20d14f12dbd3646f1f1bf23e8c.tar.gz
blackbird-op-linux-0d67a46df0125e20d14f12dbd3646f1f1bf23e8c.zip
[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>
-rw-r--r--include/linux/sched.h1
-rw-r--r--kernel/exit.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index a06fc89cf6e5..fc4a9873ec10 100644
--- 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 2e4c13cba95a..c189de2927ab 100644
--- 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>
OpenPOWER on IntegriCloud