diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/huge_mm.h | 1 | ||||
| -rw-r--r-- | include/linux/hugetlb.h | 3 | ||||
| -rw-r--r-- | include/linux/pagemap.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 19a7bfce279e..cae97c307280 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -230,6 +230,7 @@ static inline bool thp_vma_suitable_order(struct vm_area_struct *vma, /* Don't have to check pgoff for anonymous vma */ if (!vma_is_anonymous(vma)) { + /* vma_start_pgoff() in mm.h so not available. */ if (!IS_ALIGNED((vma->vm_start >> PAGE_SHIFT) - vma->vm_pgoff, hpage_size >> PAGE_SHIFT)) return false; diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 95b1b6ee1f96..6ca232a61643 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -801,8 +801,7 @@ static inline pgoff_t hugetlb_linear_page_index(struct vm_area_struct *vma, { struct hstate *h = hstate_vma(vma); - return ((address - vma->vm_start) >> huge_page_shift(h)) + - (vma->vm_pgoff >> huge_page_order(h)); + return linear_page_index(vma, address) >> huge_page_order(h); } static inline bool order_is_gigantic(unsigned int order) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index a950070b045f..c6fc783aaee5 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1097,7 +1097,7 @@ static inline pgoff_t linear_page_index(const struct vm_area_struct *vma, pgoff_t pgoff; pgoff = linear_page_delta(vma, address); - pgoff += vma->vm_pgoff; + pgoff += vma_start_pgoff(vma); return pgoff; } |