Revert "netfilter: xt_qtaguid: Allow tracking loopback"

[firefly-linux-kernel-4.4.55.git] / mm / mincore.c

diff --git a/mm/mincore.c b/mm/mincore.c
index 9ac42dc6d7b61481b1eedb8e12b463bd151b1f92..117ff5492795d6962d651b86799070e3fc18c75e 100644 (file)
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -154,7 +154,14 @@ static void mincore_pmd_range(struct vm_area_struct *vma, pud_t *pud,
        pmd = pmd_offset(pud, addr);
        do {
                next = pmd_addr_end(addr, end);
-               if (pmd_none_or_clear_bad(pmd))
+               if (pmd_trans_huge(*pmd)) {
+                       if (mincore_huge_pmd(vma, pmd, addr, next, vec)) {
+                               vec += (next - addr) >> PAGE_SHIFT;
+                               continue;
+                       }
+                       /* fall through */
+               }
+               if (pmd_none_or_trans_huge_or_clear_bad(pmd))
                        mincore_unmapped_range(vma, addr, next, vec);
                else
                        mincore_pte_range(vma, pmd, addr, next, vec);