The patch titled Subject: mm: make copy_pte_range static again has been added to the -mm tree. Its filename is mm-make-copy_pte_range-static-again.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-make-copy_pte_range-static-again.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-make-copy_pte_range-static-again.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Jerome Marchand" <jmarchan@xxxxxxxxxx> Subject: 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@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/huge_mm.h | 4 ---- mm/memory.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff -puN include/linux/huge_mm.h~mm-make-copy_pte_range-static-again include/linux/huge_mm.h --- a/include/linux/huge_mm.h~mm-make-copy_pte_range-static-again +++ a/include/linux/huge_mm.h @@ -93,10 +93,6 @@ extern bool is_vma_temporary_stack(struc #endif /* CONFIG_DEBUG_VM */ extern unsigned long transparent_hugepage_flags; -extern 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); extern int split_huge_page_to_list(struct page *page, struct list_head *list); static inline int split_huge_page(struct page *page) { diff -puN mm/memory.c~mm-make-copy_pte_range-static-again mm/memory.c --- a/mm/memory.c~mm-make-copy_pte_range-static-again +++ a/mm/memory.c @@ -884,7 +884,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) { _ Patches currently in -mm which might be from jmarchan@xxxxxxxxxx are zram-revalidate-disk-after-capacity-change.patch mm-make-copy_pte_range-static-again.patch zram-use-size_t-instead-of-u16.patch zram-remove-global-tb_lock-with-fine-grain-lock.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html