kill do_mmap() completely

just pull into vm_mmap()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 10 insertions, 22 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index f7786542c59d..538c905d6d9b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1102,28 +1102,22 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
         return mmap_region(file, addr, len, flags, vm_flags, pgoff);
 }
 
-static unsigned long do_mmap(struct file *file, unsigned long addr,
+unsigned long vm_mmap(struct file *file, unsigned long addr,
         unsigned long len, unsigned long prot,
         unsigned long flag, unsigned long offset)
 {
+        unsigned long ret;
+        struct mm_struct *mm = current->mm;
+
         if (unlikely(offset + PAGE_ALIGN(len) < offset))
                 return -EINVAL;
         if (unlikely(offset & ~PAGE_MASK))
                 return -EINVAL;
-        return do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
-}
-
-unsigned long vm_mmap(struct file *file, unsigned long addr,
-        unsigned long len, unsigned long prot,
-        unsigned long flag, unsigned long offset)
-{
-        unsigned long ret;
-        struct mm_struct *mm = current->mm;
 
         ret = security_mmap_file(file, prot, flag);
         if (!ret) {
                 down_write(&mm->mmap_sem);
-                ret = do_mmap(file, addr, len, prot, flag, offset);
+                ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
                 up_write(&mm->mmap_sem);
         }
         return ret;
diff --git a/mm/nommu.c b/mm/nommu.c
index a1792ed2cb1a..e6123a5b2cc1 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1470,28 +1470,22 @@ error_getting_region:
         return -ENOMEM;
 }
 
-static unsigned long do_mmap(struct file *file, unsigned long addr,
+unsigned long vm_mmap(struct file *file, unsigned long addr,
         unsigned long len, unsigned long prot,
         unsigned long flag, unsigned long offset)
 {
+        unsigned long ret;
+        struct mm_struct *mm = current->mm;
+
         if (unlikely(offset + PAGE_ALIGN(len) < offset))
                 return -EINVAL;
         if (unlikely(offset & ~PAGE_MASK))
                 return -EINVAL;
-        return do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
-}
-
-unsigned long vm_mmap(struct file *file, unsigned long addr,
-        unsigned long len, unsigned long prot,
-        unsigned long flag, unsigned long offset)
-{
-        unsigned long ret;
-        struct mm_struct *mm = current->mm;
 
         ret = security_mmap_file(file, prot, flag);
         if (!ret) {
                 down_write(&mm->mmap_sem);
-                ret = do_mmap(file, addr, len, prot, flag, offset);
+                ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
                 up_write(&mm->mmap_sem);
         }
         return ret;