mm-hugetlb-drop-__unmap_hugepage_range-definition-from-hugetlbh.patch removed from -mm tree
The patch titled
Subject: mm/hugetlb: drop __unmap_hugepage_range definition from hugetlb.h
has been removed from the -mm tree. Its filename was
mm-hugetlb-drop-__unmap_hugepage_range-definition-from-hugetlbh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/hugetlb: drop __unmap_hugepage_range definition from hugetlb.h
Remove __unmap_hugepage_range() from the header file, because it is only used in hugetlb.c.
Signed-off-by Peter Xu <[email protected]>
Suggested-by Mike Kravetz <[email protected]>
Reviewed-by Mike Kravetz <[email protected]>
Reviewed-by John Hubbard <[email protected]>
Reviewed-by Muchun Song <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/hugetlb.h | 10 ---------- mm/hugetlb.c | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-)
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-drop-__unmap_hugepage_range-definition-from-hugetlbh +0 -10
@@ -143,9 +143,6 @@ void __unmap_hugepage_range_final(structstruct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page); -void __unmap_hugepage_range (struct mmu_gather *tlb,struct vm_area_struct *vma, -unsigned long start,unsigned long end, -struct page *ref_page);void hugetlb_report_meminfo (struct seq_file *);int hugetlb_report_node_meminfo (char *buf,int len,int nid);void hugetlb_show_meminfo (void );
@@ -382,13 +379,6 @@ static inline void __unmap_hugepage_rang struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page) { -BUG (); -} - -static inline void __unmap_hugepage_range (struct mmu_gather *tlb, -struct vm_area_struct *vma,unsigned long start, -unsigned long end,struct page *ref_page) -{BUG (); }
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-drop-__unmap_hugepage_range-definition-from-hugetlbh +3 -3
@@ -4426,9 +4426,9 @@ again:return ret; } -void __unmap_hugepage_range (struct mmu_gather *tlb,struct vm_area_struct *vma, -unsigned long start,unsigned long end, -struct page *ref_page) +static void __unmap_hugepage_range (struct mmu_gather *tlb,struct vm_area_struct *vma, +unsigned long start,unsigned long end, +struct page *ref_page) {struct mm_struct *mm = vma->vm_mm;unsigned long address;
_
Patches currently in -mm which might be from [email protected] are