diff options
author | Jerome Marchand <jmarchan@redhat.com> | 2014-08-06 19:06:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:19 -0400 |
commit | 21bda264f4243f61dfcc485174055f12ad0530b4 (patch) | |
tree | edf7f25dcb13287e0e34908f76fc6096619cf2c2 | |
parent | ed4d4902ebdd7ca8b5a51daaf6bebf4b172895cc (diff) |
mm: make copy_pte_range static again
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>
-rw-r--r-- | include/linux/huge_mm.h | 4 | ||||
-rw-r--r-- | mm/memory.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index b826239bdce0..63579cb8d3dc 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h | |||
@@ -93,10 +93,6 @@ extern bool is_vma_temporary_stack(struct vm_area_struct *vma); | |||
93 | #endif /* CONFIG_DEBUG_VM */ | 93 | #endif /* CONFIG_DEBUG_VM */ |
94 | 94 | ||
95 | extern unsigned long transparent_hugepage_flags; | 95 | extern unsigned long transparent_hugepage_flags; |
96 | extern int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm, | ||
97 | pmd_t *dst_pmd, pmd_t *src_pmd, | ||
98 | struct vm_area_struct *vma, | ||
99 | unsigned long addr, unsigned long end); | ||
100 | extern int split_huge_page_to_list(struct page *page, struct list_head *list); | 96 | extern int split_huge_page_to_list(struct page *page, struct list_head *list); |
101 | static inline int split_huge_page(struct page *page) | 97 | static inline int split_huge_page(struct page *page) |
102 | { | 98 | { |
diff --git a/mm/memory.c b/mm/memory.c index 06ff0720d75a..01d0289f30a7 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -884,7 +884,7 @@ out_set_pte: | |||
884 | return 0; | 884 | return 0; |
885 | } | 885 | } |
886 | 886 | ||
887 | int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm, | 887 | static int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm, |
888 | pmd_t *dst_pmd, pmd_t *src_pmd, struct vm_area_struct *vma, | 888 | pmd_t *dst_pmd, pmd_t *src_pmd, struct vm_area_struct *vma, |
889 | unsigned long addr, unsigned long end) | 889 | unsigned long addr, unsigned long end) |
890 | { | 890 | { |