1 files changed, 5 insertions, 52 deletions

diff --git a/fs/aio.c b/fs/aio.c
index d065b2c3273e..02a2c9340573 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -24,6 +24,7 @@
 #include <linux/file.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
+#include <linux/mmu_context.h>
 #include <linux/slab.h>
 #include <linux/timer.h>
 #include <linux/aio.h>
@@ -34,7 +35,6 @@
 
 #include <asm/kmap_types.h>
 #include <asm/uaccess.h>
-#include <asm/mmu_context.h>
 
 #if DEBUG > 1
 #define dprintk         printk
@@ -78,6 +78,7 @@ static int __init aio_setup(void)
 
         return 0;
 }
+__initcall(aio_setup);
 
 static void aio_free_ring(struct kioctx *ctx)
 {
@@ -380,6 +381,7 @@ ssize_t wait_on_sync_kiocb(struct kiocb *iocb)
         __set_current_state(TASK_RUNNING);
         return iocb->ki_user_data;
 }
+EXPORT_SYMBOL(wait_on_sync_kiocb);
 
 /* exit_aio: called when the last user of mm goes away.  At this point, 
  * there is no way for any new requests to be submited or any of the 
@@ -573,6 +575,7 @@ int aio_put_req(struct kiocb *req)
         spin_unlock_irq(&ctx->ctx_lock);
         return ret;
 }
+EXPORT_SYMBOL(aio_put_req);
 
 static struct kioctx *lookup_ioctx(unsigned long ctx_id)
 {
@@ -595,51 +598,6 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)
 }
 
 /*
- * use_mm
- *      Makes the calling kernel thread take on the specified
- *      mm context.
- *      Called by the retry thread execute retries within the
- *      iocb issuer's mm context, so that copy_from/to_user
- *      operations work seamlessly for aio.
- *      (Note: this routine is intended to be called only
- *      from a kernel thread context)
- */
-static void use_mm(struct mm_struct *mm)
-{
-        struct mm_struct *active_mm;
-        struct task_struct *tsk = current;
-
-        task_lock(tsk);
-        active_mm = tsk->active_mm;
-        atomic_inc(&mm->mm_count);
-        tsk->mm = mm;
-        tsk->active_mm = mm;
-        switch_mm(active_mm, mm, tsk);
-        task_unlock(tsk);
-
-        mmdrop(active_mm);
-}
-
-/*
- * unuse_mm
- *      Reverses the effect of use_mm, i.e. releases the
- *      specified mm context which was earlier taken on
- *      by the calling kernel thread
- *      (Note: this routine is intended to be called only
- *      from a kernel thread context)
- */
-static void unuse_mm(struct mm_struct *mm)
-{
-        struct task_struct *tsk = current;
-
-        task_lock(tsk);
-        tsk->mm = NULL;
-        /* active_mm is still 'mm' */
-        enter_lazy_tlb(mm, tsk);
-        task_unlock(tsk);
-}
-
-/*
  * Queue up a kiocb to be retried. Assumes that the kiocb
  * has already been marked as kicked, and places it on
  * the retry run list for the corresponding ioctx, if it
@@ -1037,6 +995,7 @@ put_rq:
         spin_unlock_irqrestore(&ctx->ctx_lock, flags);
         return ret;
 }
+EXPORT_SYMBOL(aio_complete);
 
 /* aio_read_evt
  *      Pull an event off of the ioctx's event ring.  Returns the number of 
@@ -1825,9 +1784,3 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
         asmlinkage_protect(5, ret, ctx_id, min_nr, nr, events, timeout);
         return ret;
 }
-
-__initcall(aio_setup);
-
-EXPORT_SYMBOL(aio_complete);
-EXPORT_SYMBOL(aio_put_req);
-EXPORT_SYMBOL(wait_on_sync_kiocb);