mm/pgtable: drop pgtable_t variable from pte_fn_t functions

[mirror_ubuntu-jammy-kernel.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index ddf20bd0c3171a246f67ff293b978337608aaaaa..0428ff5ee33903cbf55650e54a1792a450914e03 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1475,8 +1475,6 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
        set_pte_at(mm, addr, pte, mk_pte(page, prot));
 
        retval = 0;
-       pte_unmap_unlock(pte, ptl);
-       return retval;
 out_unlock:
        pte_unmap_unlock(pte, ptl);
 out:
@@ -2038,7 +2036,6 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd,
 {
        pte_t *pte;
        int err;
-       pgtable_t token;
        spinlock_t *uninitialized_var(ptl);
 
        pte = (mm == &init_mm) ?
@@ -2051,10 +2048,8 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd,
 
        arch_enter_lazy_mmu_mode();
 
-       token = pmd_pgtable(*pmd);
-
        do {
-               err = fn(pte++, token, addr, data);
+               err = fn(pte++, addr, data);
                if (err)
                        break;
        } while (addr += PAGE_SIZE, addr != end);
@@ -2807,7 +2802,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
                struct swap_info_struct *si = swp_swap_info(entry);
 
                if (si->flags & SWP_SYNCHRONOUS_IO &&
-                               __swap_count(si, entry) == 1) {
+                               __swap_count(entry) == 1) {
                        /* skip swapcache */
                        page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma,
                                                        vmf->address);