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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 23 insertions, 5 deletions

diff --git a/mm/pagewalk.c b/mm/pagewalk.c
index 8b1a2ce21ee5..c3450d533611 100644
--- a/mm/pagewalk.c
+++ b/mm/pagewalk.c
@@ -33,18 +33,35 @@ static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
 
         pmd = pmd_offset(pud, addr);
         do {
+again:
                 next = pmd_addr_end(addr, end);
-                if (pmd_none_or_clear_bad(pmd)) {
+                if (pmd_none(*pmd)) {
                         if (walk->pte_hole)
                                 err = walk->pte_hole(addr, next, walk);
                         if (err)
                                 break;
                         continue;
                 }
+                /*
+                 * This implies that each ->pmd_entry() handler
+                 * needs to know about pmd_trans_huge() pmds
+                 */
                 if (walk->pmd_entry)
                         err = walk->pmd_entry(pmd, addr, next, walk);
-                if (!err && walk->pte_entry)
-                        err = walk_pte_range(pmd, addr, next, walk);
+                if (err)
+                        break;
+
+                /*
+                 * Check this here so we only break down trans_huge
+                 * pages when we _need_ to
+                 */
+                if (!walk->pte_entry)
+                        continue;
+
+                split_huge_page_pmd(walk->mm, pmd);
+                if (pmd_none_or_clear_bad(pmd))
+                        goto again;
+                err = walk_pte_range(pmd, addr, next, walk);
                 if (err)
                         break;
         } while (pmd++, addr = next, addr != end);
@@ -139,7 +156,6 @@ int walk_page_range(unsigned long addr, unsigned long end,
         pgd_t *pgd;
         unsigned long next;
         int err = 0;
-        struct vm_area_struct *vma;
 
         if (addr >= end)
                 return err;
@@ -149,15 +165,17 @@ int walk_page_range(unsigned long addr, unsigned long end,
 
         pgd = pgd_offset(walk->mm, addr);
         do {
+                struct vm_area_struct *uninitialized_var(vma);
+
                 next = pgd_addr_end(addr, end);
 
+#ifdef CONFIG_HUGETLB_PAGE
                 /*
                  * handle hugetlb vma individually because pagetable walk for
                  * the hugetlb page is dependent on the architecture and
                  * we can't handled it in the same manner as non-huge pages.
                  */
                 vma = find_vma(walk->mm, addr);
-#ifdef CONFIG_HUGETLB_PAGE
                 if (vma && is_vm_hugetlb_page(vma)) {
                         if (vma->vm_end < next)
                                 next = vma->vm_end;