From af92ecd433b6143ebdf7f4118203b03277295322 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 30 May 2012 20:11:57 -0400
Subject: [PATCH] --- yaml --- r: 310043 b: refs/heads/master c:
 dc982501d9643ab0c117e7d87562857ce234652d h: refs/heads/master i:   310041:
 0eb5e9ad7d9f00300bb46de2835c39e156785dc8   310039:
 c58e7f6b896822f12df28ce91f762f832847bdd1 v: v3

---
 [refs]           |  2 +-
 trunk/mm/mmap.c  | 16 +++++-----------
 trunk/mm/nommu.c | 16 +++++-----------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 9ec20a81174e..6ccfebb43b49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3fc629d7bb70848fbf479688a66d4e76dff46ac
+refs/heads/master: dc982501d9643ab0c117e7d87562857ce234652d
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index f7786542c59d..538c905d6d9b 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/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/trunk/mm/nommu.c b/trunk/mm/nommu.c
index a1792ed2cb1a..e6123a5b2cc1 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -1470,28 +1470,22 @@ unsigned long do_mmap_pgoff(struct file *file,
 	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;