diff options
| author | Punit Agrawal <punit.agrawal@arm.com> | 2017-05-26 11:31:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-26 11:31:57 +1000 |
| commit | 909128d2c774560617a4de8468c4cc845cb443f2 (patch) | |
| tree | 78c52293d9b2b320fc46a5972379191ad7b1b298 | |
| parent | b6ebe9b384470010fdc0a911bfc48f07cf64c4a5 (diff) | |
mm-hugetlb-introduce-set_huge_swap_pte_at-helper-v4
Link: http://lkml.kernel.org/r/20170524115409.31309-8-punit.agrawal@arm.com
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Acked-by: Steve Capper <steve.capper@arm.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | include/linux/hugetlb.h | 11 | ||||
| -rw-r--r-- | mm/hugetlb.c | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 83d46b2a7cd2..456f833906ce 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -158,9 +158,6 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, unsigned long address, unsigned long end, pgprot_t newprot); bool is_hugetlb_entry_migration(pte_t pte); - -void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte, unsigned long sz); #else /* !CONFIG_HUGETLB_PAGE */ static inline void reset_vma_resv_huge_pages(struct vm_area_struct *vma) @@ -448,6 +445,14 @@ static inline pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma, } #endif +#ifndef set_huge_swap_pte_at +static inline void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned long sz) +{ + set_huge_pte_at(mm, addr, ptep, pte); +} +#endif + static inline struct hstate *page_hstate(struct page *page) { VM_BUG_ON_PAGE(!PageHuge(page), page); diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 160ab5d6949a..51d31352a5bf 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3224,12 +3224,6 @@ static int is_hugetlb_entry_hwpoisoned(pte_t pte) return 0; } -void __weak set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte, unsigned long sz) -{ - set_huge_pte_at(mm, addr, ptep, pte); -} - int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, struct vm_area_struct *vma) { |