diff options
| author | Michael Ellerman | 2016-02-25 11:52:58 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2016-02-25 11:52:58 +0100 |
| commit | 2527083cb831024d22a03f68f54f6a46ecf5bf6c (patch) | |
| tree | 41de92d988a4deccb2d5087a964a51682f155e99 /mm/huge_memory.c | |
| parent | powerpc: Fix BUG_ON() reporting in real mode (diff) | |
| parent | powerpc/mm/hash: Clear the invalid slot information correctly (diff) | |
| download | kernel-qcow2-linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.gz kernel-qcow2-linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.xz kernel-qcow2-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/huge_memory.c')
| -rw-r--r-- | mm/huge_memory.c | 1 |
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); |