Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 0 deletions

diff --git a/mm/mincore.c b/mm/mincore.c
index 9ac42dc6d7b6..a4e6b9d75c76 100644
--- a/mm/mincore.c
+++ b/mm/mincore.c
@@ -154,6 +154,13 @@ 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_trans_huge(*pmd)) {
+                        if (mincore_huge_pmd(vma, pmd, addr, next, vec)) {
+                                vec += (next - addr) >> PAGE_SHIFT;
+                                continue;
+                        }
+                        /* fall through */
+                }
                 if (pmd_none_or_clear_bad(pmd))
                         mincore_unmapped_range(vma, addr, next, vec);
                 else