Merge tag 'for-linux-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 21a98cb..96799a2 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1951,8 +1951,6 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
        si = swap_info[type];
        pte = pte_offset_map(pmd, addr);
        do {
-               struct vm_fault vmf;
-
                if (!is_swap_pte(*pte))
                        continue;
 
@@ -1968,9 +1966,12 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                swap_map = &si->swap_map[offset];
                page = lookup_swap_cache(entry, vma, addr);
                if (!page) {
-                       vmf.vma = vma;
-                       vmf.address = addr;
-                       vmf.pmd = pmd;
+                       struct vm_fault vmf = {
+                               .vma = vma,
+                               .address = addr,
+                               .pmd = pmd,
+                       };
+
                        page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE,
                                                &vmf);
                }