2014-07-01 08:18:00

by Jerome Marchand

Subject: [PATCH] mm: make copy_pte_range static again

Commit 71e3aac (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 <[email protected]>
---
include/linux/huge_mm.h | 4 ----
mm/memory.c | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index b826239..63579cb 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);
#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 --git a/mm/memory.c b/mm/memory.c
index 09e2cd0..13141ae 100644
--- a/mm/memory.c
+++ b/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)
{
--
1.9.3

2014-07-01 23:36:00

by David Rientjes

Subject: Re: [PATCH] mm: make copy_pte_range static again

On Tue, 1 Jul 2014, Jerome Marchand wrote:

> Commit 71e3aac (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 <[email protected]>

Acked-by: David Rientjes <[email protected]>