Skip to content

Commit 1514761

Browse files
Gu Zitaoopsiff
authored andcommitted
sw64: adapt to the upstream changes in huge_ptep_get_and_clear
Fix it according to upstream commit 02410ac ("mm: hugetlb: Add huge page size param to huge_ptep_get_and_clear()"). Signed-off-by: Gu Zitao <guzitao@wxiat.com> Reviewed-by: He Sheng <hesheng@wxiat.com> Signed-off-by: Gu Zitao <guzitao@wxiat.com> (cherry picked from commit a2f0a96)
1 parent 6d51bf8 commit 1514761

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

arch/sw_64/include/asm/hugetlb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
1515

1616
#define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR
1717
extern pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
18-
unsigned long addr, pte_t *ptep);
18+
unsigned long addr, pte_t *ptep, unsigned long sz);
1919

2020
#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH
2121
extern pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr,

arch/sw_64/mm/hugetlbpage_c4.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm,
280280
}
281281

282282
pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
283-
unsigned long addr, pte_t *ptep)
283+
unsigned long addr, pte_t *ptep,
284+
unsigned long sz)
284285
{
285286
int ncontig;
286287
size_t pgsize;

0 commit comments

Comments
 (0)