aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-30 20:08:42 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-06-01 10:37:17 -0400
commite3fc629d7bb70848fbf479688a66d4e76dff46ac (patch)
tree96b6d5ffdb1c643fb28807a635e6ca4e24964034 /mm
parent98de59bfe4b2ff6344d9ad8e5296f80de5dcc5b6 (diff)
switch aio and shm to do_mmap_pgoff(), make do_mmap() static
after all, 0 bytes and 0 pages is the same thing... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/mmap.c4
-rw-r--r--mm/nommu.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index 131521e12f1..f7786542c59 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -971,7 +971,7 @@ static inline unsigned long round_hint_to_min(unsigned long hint)
971 * The caller must hold down_write(&current->mm->mmap_sem). 971 * The caller must hold down_write(&current->mm->mmap_sem).
972 */ 972 */
973 973
974static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, 974unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
975 unsigned long len, unsigned long prot, 975 unsigned long len, unsigned long prot,
976 unsigned long flags, unsigned long pgoff) 976 unsigned long flags, unsigned long pgoff)
977{ 977{
@@ -1102,7 +1102,7 @@ static unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
1102 return mmap_region(file, addr, len, flags, vm_flags, pgoff); 1102 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
1103} 1103}
1104 1104
1105unsigned long do_mmap(struct file *file, unsigned long addr, 1105static unsigned long do_mmap(struct file *file, unsigned long addr,
1106 unsigned long len, unsigned long prot, 1106 unsigned long len, unsigned long prot,
1107 unsigned long flag, unsigned long offset) 1107 unsigned long flag, unsigned long offset)
1108{ 1108{
diff --git a/mm/nommu.c b/mm/nommu.c
index 8cbfd623b04..a1792ed2cb1 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1232,7 +1232,7 @@ enomem:
1232/* 1232/*
1233 * handle mapping creation for uClinux 1233 * handle mapping creation for uClinux
1234 */ 1234 */
1235static unsigned long do_mmap_pgoff(struct file *file, 1235unsigned long do_mmap_pgoff(struct file *file,
1236 unsigned long addr, 1236 unsigned long addr,
1237 unsigned long len, 1237 unsigned long len,
1238 unsigned long prot, 1238 unsigned long prot,
@@ -1470,7 +1470,7 @@ error_getting_region:
1470 return -ENOMEM; 1470 return -ENOMEM;
1471} 1471}
1472 1472
1473unsigned long do_mmap(struct file *file, unsigned long addr, 1473static unsigned long do_mmap(struct file *file, unsigned long addr,
1474 unsigned long len, unsigned long prot, 1474 unsigned long len, unsigned long prot,
1475 unsigned long flag, unsigned long offset) 1475 unsigned long flag, unsigned long offset)
1476{ 1476{