diff --git a/[refs] b/[refs] index fe3d0f972e06..f06d6291f48b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf9a2ae8d49948f861b56e5333530e491a9da190 +refs/heads/master: 0d67a46df0125e20d14f12dbd3646f1f1bf23e8c diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index a06fc89cf6e5..fc4a9873ec10 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/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/trunk/kernel/exit.c b/trunk/kernel/exit.c index 2e4c13cba95a..c189de2927ab 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -38,6 +38,7 @@ #include #include /* for audit_free() */ #include +#include #include #include