summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2016-02-25 21:52:58 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2016-02-25 21:52:58 +1100
commit2527083cb831024d22a03f68f54f6a46ecf5bf6c (patch)
tree41de92d988a4deccb2d5087a964a51682f155e99 /mm
parenta4c3f909b4d9bb9430bf42ad583661df6dfa86c6 (diff)
parent9ab3ac233a8b4ffcc27c8475b83dee49fc46bc76 (diff)
downloadlinux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.gz
linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.bz2
linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.zip
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.
Diffstat (limited to 'mm')
-rw-r--r--mm/huge_memory.c1
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);