HID: i2c-hid: use "struct i2c_hid" as argument in most calls

[linux-2.6-block.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 16d2ee160d43c572d5a19ed989b7a8d70df8e9ca..8f584eddd305380d3aae8fb810998e9530468f42 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -271,6 +271,7 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone)
        /* Phase 1: page isolation */
        for (i = 0; i < nr; i++) {
                struct page *page = pvec->pages[i];
+               struct folio *folio = page_folio(page);
 
                if (TestClearPageMlocked(page)) {
                        /*
@@ -278,7 +279,7 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone)
                         * so we can spare the get_page() here.
                         */
                        if (TestClearPageLRU(page)) {
-                               lruvec = relock_page_lruvec_irq(page, lruvec);
+                               lruvec = folio_lruvec_relock_irq(folio, lruvec);
                                del_page_from_lru_list(page, lruvec);
                                continue;
                        } else
@@ -511,7 +512,7 @@ static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
        pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT);
        *prev = vma_merge(mm, *prev, start, end, newflags, vma->anon_vma,
                          vma->vm_file, pgoff, vma_policy(vma),
-                         vma->vm_userfaultfd_ctx);
+                         vma->vm_userfaultfd_ctx, vma_anon_name(vma));
        if (*prev) {
                vma = *prev;
                goto success;