Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 84a6c7694aad1e1fe41ee7f66b9142e6c6b0347d

Authored by Jerome Marchand
Committed by Jiri Slaby
1 parent 6a01f8dd25
Exists in ti-linux-3.12.y and in 2 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.y

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>

Showing 2 changed files with 1 additions and 5 deletions Side-by-side Diff

include/linux/huge_mm.h
Diff comments   View file @ 84a6c76
... ... @@ -92,10 +92,6 @@
92 92 #endif /* CONFIG_DEBUG_VM */
93 93  
94 94 extern unsigned long transparent_hugepage_flags;
95   -extern int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
96   - pmd_t *dst_pmd, pmd_t *src_pmd,
97   - struct vm_area_struct *vma,
98   - unsigned long addr, unsigned long end);
99 95 extern int split_huge_page_to_list(struct page *page, struct list_head *list);
100 96 static inline int split_huge_page(struct page *page)
101 97 {
... ... @@ -878,7 +878,7 @@
878 878 return 0;
879 879 }
880 880  
881   -int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
  881 +static int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
882 882 pmd_t *dst_pmd, pmd_t *src_pmd, struct vm_area_struct *vma,
883 883 unsigned long addr, unsigned long end)
884 884 {