Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-block.git] / mm / rmap.c

diff --git a/mm/rmap.c b/mm/rmap.c
index 8a839935b18c000ecaa8411f0ffaf6c5ee81b998..0ea5d9071b32b967d012f36e600a2ee75acd8f3d 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1098,6 +1098,8 @@ void page_move_anon_rmap(struct page *page,
 
        VM_BUG_ON_PAGE(!PageLocked(page), page);
        VM_BUG_ON_VMA(!anon_vma, vma);
+       if (IS_ENABLED(CONFIG_DEBUG_VM) && PageTransHuge(page))
+               address &= HPAGE_PMD_MASK;
        VM_BUG_ON_PAGE(page->index != linear_page_index(vma, address), page);
 
        anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;