Merge tag 'pinctrl-v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-block.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 9efdc021ad2202fc9ebd7e55fe572813136d2f2c..aa0dc8231c0d0df33d1137199290b5d3422d2ca2 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1488,9 +1488,9 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
        return addr;
 }
 
-SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
-               unsigned long, prot, unsigned long, flags,
-               unsigned long, fd, unsigned long, pgoff)
+unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
+                             unsigned long prot, unsigned long flags,
+                             unsigned long fd, unsigned long pgoff)
 {
        struct file *file = NULL;
        unsigned long retval;
@@ -1537,6 +1537,13 @@ out_fput:
        return retval;
 }
 
+SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
+               unsigned long, prot, unsigned long, flags,
+               unsigned long, fd, unsigned long, pgoff)
+{
+       return ksys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
+}
+
 #ifdef __ARCH_WANT_SYS_OLD_MMAP
 struct mmap_arg_struct {
        unsigned long addr;
@@ -1556,8 +1563,8 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
        if (offset_in_page(a.offset))
                return -EINVAL;
 
-       return sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
-                             a.offset >> PAGE_SHIFT);
+       return ksys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
+                              a.offset >> PAGE_SHIFT);
 }
 #endif /* __ARCH_WANT_SYS_OLD_MMAP */