aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorJerome Marchand <jmarchan@redhat.com>2014-08-06 16:06:56 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-29 17:40:52 -0800
commit63aefc47b630e845bd46e5303cb7a3a3f44c8e6f (patch)
tree7788680a28cb0e23ae772e379ae4eb194575add5 /mm/memory.c
parent06ed94e91856817cc64e81378c0f1d7fd605d169 (diff)
downloadlinux-yocto-63aefc47b630e845bd46e5303cb7a3a3f44c8e6f.tar.gz
linux-yocto-63aefc47b630e845bd46e5303cb7a3a3f44c8e6f.tar.bz2
linux-yocto-63aefc47b630e845bd46e5303cb7a3a3f44c8e6f.zip
mm: make copy_pte_range static again
commit 21bda264f4243f61dfcc485174055f12ad0530b4 upstream. Commit 71e3aac0724f ("thp: transparent hugepage core") adds copy_pte_range prototype to huge_mm.h. I'm not sure why (or if) this function have been used outside of memory.c, but it currently isn't. This patch makes copy_pte_range() static again. Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Mel Gorman <mgorman@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 728eba39d4fc..7f30beaba74f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -878,7 +878,7 @@ out_set_pte:
return 0;
}
-int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
+static int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
pmd_t *dst_pmd, pmd_t *src_pmd, struct vm_area_struct *vma,
unsigned long addr, unsigned long end)
{