Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[mirror_ubuntu-zesty-kernel.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index fbe3e2f317eb4d39e24ab4330c0ccbc01a291b74..298884dcd6e71e4723a203a82f1613cbfcec19ec 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1771,7 +1771,7 @@ unsigned long vm_brk(unsigned long addr, unsigned long len)
  *
  * MREMAP_FIXED is not supported under NOMMU conditions
  */
-unsigned long do_mremap(unsigned long addr,
+static unsigned long do_mremap(unsigned long addr,
                        unsigned long old_len, unsigned long new_len,
                        unsigned long flags, unsigned long new_addr)
 {
@@ -1806,7 +1806,6 @@ unsigned long do_mremap(unsigned long addr,
        vma->vm_end = vma->vm_start + new_len;
        return vma->vm_start;
 }
-EXPORT_SYMBOL(do_mremap);
 
 SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
                unsigned long, new_len, unsigned long, flags,