Merge tag 'powerpc-4.5-4' into next

Pull in our current fixes from 4.5, in particular the "Fix Multi hit
ERAT" bug is causing folks some grief when testing next.

1 files changed, 1 insertions, 0 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 08fc0ba2207e..aea8f7a42df9 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2860,6 +2860,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
         young = pmd_young(*pmd);
         dirty = pmd_dirty(*pmd);
 
+        pmdp_huge_split_prepare(vma, haddr, pmd);
         pgtable = pgtable_trans_huge_withdraw(mm, pmd);
         pmd_populate(mm, &_pmd, pgtable);