X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=mm%2Fhuge_memory.c;h=00704060b7f79242d324af81592b0afc6384ae08;hb=e125fe405abedc1dc8a5b2229b80ee91c1434015;hp=533f9b00147d267644bcbf98da717329fb07c38f;hpb=f3c0b8ce48408b742a9154d53d19e3c7ff97772d;p=linux-block.git

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 533f9b00147d..00704060b7f7 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2931,7 +2931,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
 	else
 		page_add_file_rmap(new, true);
 	set_pmd_at(mm, mmun_start, pvmw->pmd, pmde);
-	if (vma->vm_flags & VM_LOCKED)
+	if ((vma->vm_flags & VM_LOCKED) && !PageDoubleMap(new))
 		mlock_vma_page(new);
 	update_mmu_cache_pmd(vma, address, pvmw->pmd);
 }