summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorJerome Marchand <jmarchan@redhat.com>2014-08-28 19:35:37 +0100
committerJiri Slaby <jslaby@suse.cz>2014-09-26 11:52:07 +0200
commit84a6c7694aad1e1fe41ee7f66b9142e6c6b0347d (patch)
tree166d2d45afb59f917a32fbf6b249e0e64307c4ad /mm
parent6a01f8dd2508cf79abbdccc44a6a41b2e17fb3cb (diff)
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c
index b870c9c5c89b..b5901068495f 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)
{