- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / i386 / kernel / sys_i386.c

diff --git a/arch/i386/kernel/sys_i386.c b/arch/i386/kernel/sys_i386.c
index 5ccb385..a4a6197 100644 (file)
--- a/arch/i386/kernel/sys_i386.c
+++ b/arch/i386/kernel/sys_i386.c
@@ -41,7 +41,7 @@ asmlinkage int sys_pipe(unsigned long __user * fildes)
 }
 
 /* common code for old and new mmaps */
-long do_mmap2(struct mm_struct *mm,
+static inline long do_mmap2(
        unsigned long addr, unsigned long len,
        unsigned long prot, unsigned long flags,
        unsigned long fd, unsigned long pgoff)
@@ -56,9 +56,9 @@ long do_mmap2(struct mm_struct *mm,
                        goto out;
        }
 
-       down_write(&mm->mmap_sem);
-       error = __do_mmap_pgoff(mm, file, addr, len, prot, flags, pgoff);
-       up_write(&mm->mmap_sem);
+       down_write(&current->mm->mmap_sem);
+       error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+       up_write(&current->mm->mmap_sem);
 
        if (file)
                fput(file);
@@ -70,7 +70,7 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
        unsigned long prot, unsigned long flags,
        unsigned long fd, unsigned long pgoff)
 {
-       return do_mmap2(current->mm, addr, len, prot, flags, fd, pgoff);
+       return do_mmap2(addr, len, prot, flags, fd, pgoff);
 }
 
 /*
@@ -101,7 +101,7 @@ asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)
        if (a.offset & ~PAGE_MASK)
                goto out;
 
-       err = do_mmap2(current->mm, a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
+       err = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT);
 out:
        return err;
 }