x86/smpboot: Init apic mapping before usage

[cascardo/linux.git] / mm / mincore.c

diff --git a/mm/mincore.c b/mm/mincore.c
index c0b5ba9..bfb8664 100644 (file)
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -66,7 +66,8 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff)
                 */
                if (radix_tree_exceptional_entry(page)) {
                        swp_entry_t swp = radix_to_swp_entry(page);
-                       page = find_get_page(swap_address_space(swp), swp.val);
+                       page = find_get_page(swap_address_space(swp),
+                                            swp_offset(swp));
                }
        } else
                page = find_get_page(mapping, pgoff);
@@ -150,7 +151,7 @@ static int mincore_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
                        } else {
 #ifdef CONFIG_SWAP
                                *vec = mincore_page(swap_address_space(entry),
-                                       entry.val);
+                                                   swp_offset(entry));
 #else
                                WARN_ON(1);
                                *vec = 1;