diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-20 09:22:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-20 09:22:11 -0800 |
| commit | e6a1c1e9ddcc873c33833d5c1fc69f22b1838962 (patch) | |
| tree | 9ae8bf8ed460fa4d3b95219b8bc1f56080e6cc98 /mm/huge_memory.c | |
| parent | da6b7366dbfc93f59873e252b8d53f17fb47a802 (diff) | |
| parent | 6ecad912a0073c768db1491c27ca55ad2d0ee68f (diff) | |
| download | linux-e6a1c1e9ddcc873c33833d5c1fc69f22b1838962.tar.gz linux-e6a1c1e9ddcc873c33833d5c1fc69f22b1838962.tar.bz2 linux-e6a1c1e9ddcc873c33833d5c1fc69f22b1838962.zip | |
Merge tag 'powerpc-4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- Fix build error on 32-bit with checkpoint restart from Aneesh Kumar
- Fix dedotify for binutils >= 2.26 from Andreas Schwab
- Don't trace hcalls on offline CPUs from Denis Kirjanov
- eeh: Fix stale cached primary bus from Gavin Shan
- eeh: Fix stale PE primary bus from Gavin Shan
- mm: Fix Multi hit ERAT cause by recent THP update from Aneesh Kumar K.V
- ioda: Set "read" permission when "write" is set from Alexey Kardashevskiy
* tag 'powerpc-4.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/ioda: Set "read" permission when "write" is set
powerpc/mm: Fix Multi hit ERAT cause by recent THP update
powerpc/powernv: Fix stale PE primary bus
powerpc/eeh: Fix stale cached primary bus
powerpc/pseries: Don't trace hcalls on offline CPUs
powerpc: Fix dedotify for binutils >= 2.26
powerpc/book3s_32: Fix build error with checkpoint restart
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 722546dcfb7e..1c317b85ea7d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2861,6 +2861,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); |