From 138bfb87f9eac108f188f69470c2195d7aaebb3d Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 30 May 2012 20:08:42 -0400
Subject: [PATCH] --- yaml --- r: 310042 b: refs/heads/master c:
 e3fc629d7bb70848fbf479688a66d4e76dff46ac h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/aio.c           | 6 +++---
 trunk/include/linux/mm.h | 2 +-
 trunk/ipc/shm.c          | 2 +-
 trunk/mm/mmap.c          | 4 ++--
 trunk/mm/nommu.c         | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 0add45fe317b..9ec20a81174e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98de59bfe4b2ff6344d9ad8e5296f80de5dcc5b6
+refs/heads/master: e3fc629d7bb70848fbf479688a66d4e76dff46ac
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index e7f2fad7b4ce..07154d99cc67 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -134,9 +134,9 @@ static int aio_setup_ring(struct kioctx *ctx)
 	info->mmap_size = nr_pages * PAGE_SIZE;
 	dprintk("attempting mmap of %lu bytes\n", info->mmap_size);
 	down_write(&ctx->mm->mmap_sem);
-	info->mmap_base = do_mmap(NULL, 0, info->mmap_size, 
-				  PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE,
-				  0);
+	info->mmap_base = do_mmap_pgoff(NULL, 0, info->mmap_size, 
+					PROT_READ|PROT_WRITE,
+					MAP_ANONYMOUS|MAP_PRIVATE, 0);
 	if (IS_ERR((void *)info->mmap_base)) {
 		up_write(&ctx->mm->mmap_sem);
 		info->mmap_size = 0;
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 7d5c37f24c63..4189e0d0ac05 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -1394,7 +1394,7 @@ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned lo
 extern unsigned long mmap_region(struct file *file, unsigned long addr,
 	unsigned long len, unsigned long flags,
 	vm_flags_t vm_flags, unsigned long pgoff);
-extern unsigned long do_mmap(struct file *, unsigned long,
+extern unsigned long do_mmap_pgoff(struct file *, unsigned long,
         unsigned long, unsigned long,
         unsigned long, unsigned long);
 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index e3a8063b1768..5e2cbfdab6fc 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -1054,7 +1054,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
 			goto invalid;
 	}
 		
-	user_addr = do_mmap (file, addr, size, prot, flags, 0);
+	user_addr = do_mmap_pgoff(file, addr, size, prot, flags, 0);
 	*raddr = user_addr;
 	err = 0;
 	if (IS_ERR_VALUE(user_addr))
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 131521e12f13..f7786542c59d 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -971,7 +971,7 @@ static inline unsigned long round_hint_to_min(unsigned long hint)
  * The caller must hold down_write(&current->mm->mmap_sem).
  */
 
-static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
 			unsigned long len, unsigned long prot,
 			unsigned long flags, unsigned long pgoff)
 {
@@ -1102,7 +1102,7 @@ static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
 	return mmap_region(file, addr, len, flags, vm_flags, pgoff);
 }
 
-unsigned long do_mmap(struct file *file, unsigned long addr,
+static unsigned long do_mmap(struct file *file, unsigned long addr,
 	unsigned long len, unsigned long prot,
 	unsigned long flag, unsigned long offset)
 {
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 8cbfd623b04a..a1792ed2cb1a 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -1232,7 +1232,7 @@ static int do_mmap_private(struct vm_area_struct *vma,
 /*
  * handle mapping creation for uClinux
  */
-static unsigned long do_mmap_pgoff(struct file *file,
+unsigned long do_mmap_pgoff(struct file *file,
 			    unsigned long addr,
 			    unsigned long len,
 			    unsigned long prot,
@@ -1470,7 +1470,7 @@ static unsigned long do_mmap_pgoff(struct file *file,
 	return -ENOMEM;
 }
 
-unsigned long do_mmap(struct file *file, unsigned long addr,
+static unsigned long do_mmap(struct file *file, unsigned long addr,
 	unsigned long len, unsigned long prot,
 	unsigned long flag, unsigned long offset)
 {