diff options
author | David Howells <dhowells@redhat.com> | 2006-08-29 14:05:56 -0400 |
---|---|---|
committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-09-30 14:31:20 -0400 |
commit | 0d67a46df0125e20d14f12dbd3646f1f1bf23e8c (patch) | |
tree | 8e823eedbc068e3a1ed3a4af6696a43a48fffa0a | |
parent | cf9a2ae8d49948f861b56e5333530e491a9da190 (diff) |
[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.h | 1 | ||||
-rw-r--r-- | kernel/exit.c | 1 |
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; | |||
710 | 710 | ||
711 | 711 | ||
712 | struct io_context; /* See blkdev.h */ | 712 | struct io_context; /* See blkdev.h */ |
713 | void exit_io_context(void); | ||
714 | struct cpuset; | 713 | struct cpuset; |
715 | 714 | ||
716 | #define NGROUPS_SMALL 32 | 715 | #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 @@ | |||
38 | #include <linux/pipe_fs_i.h> | 38 | #include <linux/pipe_fs_i.h> |
39 | #include <linux/audit.h> /* for audit_free() */ | 39 | #include <linux/audit.h> /* for audit_free() */ |
40 | #include <linux/resource.h> | 40 | #include <linux/resource.h> |
41 | #include <linux/blkdev.h> | ||
41 | 42 | ||
42 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
43 | #include <asm/unistd.h> | 44 | #include <asm/unistd.h> |