Skip to content

Commit f1fdec9

Browse files
Qi Zhengakpm00
authored andcommitted
x86: pgtable: convert to use tlb_remove_ptdesc()
The x86 has already been converted to use struct ptdesc, so convert it to use tlb_remove_ptdesc() instead of tlb_remove_table(). Link: https://lkml.kernel.org/r/36ad56b7e06fa4b17fb23c4fc650e8e0d72bb3cd.1740454179.git.zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Cc: Alexandre Ghiti <alexghiti@rivosinc.com> Cc: "Aneesh Kumar K.V" <aneesh.kumar@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: Hugh Dickens <hughd@google.com> Cc: Jann Horn <jannh@google.com> Cc: Kevin Brodsky <kevin.brodsky@arm.com> Cc: Matthew Wilcow (Oracle) <willy@infradead.org> Cc: "Mike Rapoport (IBM)" <rppt@kernel.org> Cc: Muchun Song <muchun.song@linux.dev> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Rik van Riel <riel@surriel.com> Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com> Cc: Will Deacon <will@kernel.org> Cc: Yu Zhao <yuzhao@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 4239c19 commit f1fdec9

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/x86/mm/pgtable.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pgtable_t pte_alloc_one(struct mm_struct *mm)
2020
void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
2121
{
2222
paravirt_release_pte(page_to_pfn(pte));
23-
tlb_remove_table(tlb, page_ptdesc(pte));
23+
tlb_remove_ptdesc(tlb, page_ptdesc(pte));
2424
}
2525

2626
#if CONFIG_PGTABLE_LEVELS > 2
@@ -34,21 +34,21 @@ void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
3434
#ifdef CONFIG_X86_PAE
3535
tlb->need_flush_all = 1;
3636
#endif
37-
tlb_remove_table(tlb, virt_to_ptdesc(pmd));
37+
tlb_remove_ptdesc(tlb, virt_to_ptdesc(pmd));
3838
}
3939

4040
#if CONFIG_PGTABLE_LEVELS > 3
4141
void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)
4242
{
4343
paravirt_release_pud(__pa(pud) >> PAGE_SHIFT);
44-
tlb_remove_table(tlb, virt_to_ptdesc(pud));
44+
tlb_remove_ptdesc(tlb, virt_to_ptdesc(pud));
4545
}
4646

4747
#if CONFIG_PGTABLE_LEVELS > 4
4848
void ___p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d)
4949
{
5050
paravirt_release_p4d(__pa(p4d) >> PAGE_SHIFT);
51-
tlb_remove_table(tlb, virt_to_ptdesc(p4d));
51+
tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d));
5252
}
5353
#endif /* CONFIG_PGTABLE_LEVELS > 4 */
5454
#endif /* CONFIG_PGTABLE_LEVELS > 3 */

0 commit comments

Comments
 (0)