diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-08-05 19:32:09 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-08-05 19:32:09 -0600 |
| commit | 05b9ba4b550ff67d7362608828405f9e389e8988 (patch) | |
| tree | 12b0f4e41c1491fe5087480d9c47e61aff8a1d33 /mm/huge_memory.c | |
| parent | 704f83928c8e7da6e06144569efb15dec73278e8 (diff) | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
| download | lwn-05b9ba4b550ff67d7362608828405f9e389e8988.tar.gz lwn-05b9ba4b550ff67d7362608828405f9e389e8988.zip | |
Merge tag 'v4.18-rc6' into for-4.19/block2
Pull in 4.18-rc6 to get the NVMe core AEN change to avoid a
merge conflict down the line.
Signed-of-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'mm/huge_memory.c')
| -rw-r--r-- | mm/huge_memory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b87d5b151db2..a9e1e093df51 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2084,6 +2084,8 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, if (vma_is_dax(vma)) return; page = pmd_page(_pmd); + if (!PageDirty(page) && pmd_dirty(_pmd)) + set_page_dirty(page); if (!PageReferenced(page) && pmd_young(_pmd)) SetPageReferenced(page); page_remove_rmap(page, true); |