| Message ID | 20210917165108.9341-1-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] mm/hugetlb: Drop __unmap_hugepage_range definition from hugetlb.h | expand |
On 17.09.21 18:51, Peter Xu wrote: > Remove __unmap_hugepage_range() from the header file, because it is only used > in hugetlb.c. > > Suggested-by: Mike Kravetz <mike.kravetz@oracle.com> > Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com> > Reviewed-by: John Hubbard <jhubbard@nvidia.com> > Reviewed-by: Muchun Song <songmuchun@bytedance.com> > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > include/linux/hugetlb.h | 10 ---------- > mm/hugetlb.c | 6 +++--- > 2 files changed, 3 insertions(+), 13 deletions(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index 1faebe1cd0ed..3cbf60464398 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -143,9 +143,6 @@ void __unmap_hugepage_range_final(struct mmu_gather *tlb, > struct 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); > @@ -385,13 +382,6 @@ static inline void __unmap_hugepage_range_final(struct mmu_gather *tlb, > 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(); > -} > - > static inline vm_fault_t hugetlb_fault(struct mm_struct *mm, > struct vm_area_struct *vma, unsigned long address, > unsigned int flags) > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 95dc7b83381f..d394d9545c4e 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -4426,9 +4426,9 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, > 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; > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 1faebe1cd0ed..3cbf60464398 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -143,9 +143,6 @@ void __unmap_hugepage_range_final(struct mmu_gather *tlb, struct 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); @@ -385,13 +382,6 @@ static inline void __unmap_hugepage_range_final(struct mmu_gather *tlb, 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(); -} - static inline vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, unsigned int flags) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 95dc7b83381f..d394d9545c4e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4426,9 +4426,9 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, 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;