Merge tag 'v4.17-rc2' into docs-next
Merge -rc2 to pick up the changes to Documentation/core-api/kernel-api.rst that hit mainline via the networking tree. In their absence, subsequent patches cannot be applied.
This commit is contained in:
@@ -2925,7 +2925,10 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
|
||||
pmde = maybe_pmd_mkwrite(pmde, vma);
|
||||
|
||||
flush_cache_range(vma, mmun_start, mmun_start + HPAGE_PMD_SIZE);
|
||||
page_add_anon_rmap(new, vma, mmun_start, true);
|
||||
if (PageAnon(new))
|
||||
page_add_anon_rmap(new, vma, mmun_start, true);
|
||||
else
|
||||
page_add_file_rmap(new, true);
|
||||
set_pmd_at(mm, mmun_start, pvmw->pmd, pmde);
|
||||
if (vma->vm_flags & VM_LOCKED)
|
||||
mlock_vma_page(new);
|
||||
|
Reference in New Issue
Block a user