mm: do not grow the stack vma just because of an overrun on preceding vma

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / mincore.c

diff --git a/mm/mincore.c b/mm/mincore.c
index 936b4cee8cb1ee126e7c78672d54062437ba5c45..da2be56a7b8fdd3c8391fd79e758f394dd63157a 100644 (file)
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -75,7 +75,7 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff)
        /* shmem/tmpfs may return swap: account for swapcache page too. */
        if (radix_tree_exceptional_entry(page)) {
                swp_entry_t swap = radix_to_swp_entry(page);
-               page = find_get_page(&swapper_space, swap.val);
+               page = find_get_page(swap_address_space(swap), swap.val);
        }
 #endif
        if (page) {
@@ -135,7 +135,8 @@ static void mincore_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                        } else {
 #ifdef CONFIG_SWAP
                                pgoff = entry.val;
-                               *vec = mincore_page(&swapper_space, pgoff);
+                               *vec = mincore_page(swap_address_space(entry),
+                                       pgoff);
 #else
                                WARN_ON(1);
                                *vec = 1;