diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-04 10:47:59 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-04 10:47:59 -0500 |
commit | 4b377bab29e6a241db42f27541e7fb63713ee178 (patch) | |
tree | e56ee3359156dd2d01ebd6dac3aaf04cbc311bec | |
parent | 2ae80c43d480548dd32591664c93ef011ac34b21 (diff) |
make do_mremap() static
The extern in sys_sparc_64.c was a rudiment of time when do_mremap()
used to exist in MMU case (it doesn't anymore). As for !MMU one,
nothing uses it outside of mm/nommu.c...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 4 | ||||
-rw-r--r-- | include/linux/mm.h | 3 | ||||
-rw-r--r-- | mm/nommu.c | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index 708bc29d36a8..42beb6fc4ad8 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c | |||
@@ -470,10 +470,6 @@ SYSCALL_DEFINE2(64_munmap, unsigned long, addr, size_t, len) | |||
470 | 470 | ||
471 | return vm_munmap(addr, len); | 471 | return vm_munmap(addr, len); |
472 | } | 472 | } |
473 | |||
474 | extern unsigned long do_mremap(unsigned long addr, | ||
475 | unsigned long old_len, unsigned long new_len, | ||
476 | unsigned long flags, unsigned long new_addr); | ||
477 | 473 | ||
478 | SYSCALL_DEFINE5(64_mremap, unsigned long, addr, unsigned long, old_len, | 474 | SYSCALL_DEFINE5(64_mremap, unsigned long, addr, unsigned long, old_len, |
479 | unsigned long, new_len, unsigned long, flags, | 475 | unsigned long, new_len, unsigned long, flags, |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 7acc9dc73c9f..f4c8aa990442 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1079,9 +1079,6 @@ extern unsigned long move_page_tables(struct vm_area_struct *vma, | |||
1079 | unsigned long old_addr, struct vm_area_struct *new_vma, | 1079 | unsigned long old_addr, struct vm_area_struct *new_vma, |
1080 | unsigned long new_addr, unsigned long len, | 1080 | unsigned long new_addr, unsigned long len, |
1081 | bool need_rmap_locks); | 1081 | bool need_rmap_locks); |
1082 | extern unsigned long do_mremap(unsigned long addr, | ||
1083 | unsigned long old_len, unsigned long new_len, | ||
1084 | unsigned long flags, unsigned long new_addr); | ||
1085 | extern unsigned long change_protection(struct vm_area_struct *vma, unsigned long start, | 1082 | extern unsigned long change_protection(struct vm_area_struct *vma, unsigned long start, |
1086 | unsigned long end, pgprot_t newprot, | 1083 | unsigned long end, pgprot_t newprot, |
1087 | int dirty_accountable, int prot_numa); | 1084 | int dirty_accountable, int prot_numa); |
diff --git a/mm/nommu.c b/mm/nommu.c index e19328087534..66737e0584ae 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -1770,7 +1770,7 @@ unsigned long vm_brk(unsigned long addr, unsigned long len) | |||
1770 | * | 1770 | * |
1771 | * MREMAP_FIXED is not supported under NOMMU conditions | 1771 | * MREMAP_FIXED is not supported under NOMMU conditions |
1772 | */ | 1772 | */ |
1773 | unsigned long do_mremap(unsigned long addr, | 1773 | static unsigned long do_mremap(unsigned long addr, |
1774 | unsigned long old_len, unsigned long new_len, | 1774 | unsigned long old_len, unsigned long new_len, |
1775 | unsigned long flags, unsigned long new_addr) | 1775 | unsigned long flags, unsigned long new_addr) |
1776 | { | 1776 | { |
@@ -1805,7 +1805,6 @@ unsigned long do_mremap(unsigned long addr, | |||
1805 | vma->vm_end = vma->vm_start + new_len; | 1805 | vma->vm_end = vma->vm_start + new_len; |
1806 | return vma->vm_start; | 1806 | return vma->vm_start; |
1807 | } | 1807 | } |
1808 | EXPORT_SYMBOL(do_mremap); | ||
1809 | 1808 | ||
1810 | SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, | 1809 | SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, |
1811 | unsigned long, new_len, unsigned long, flags, | 1810 | unsigned long, new_len, unsigned long, flags, |