mm-page_vma_mapped_walk-prettify-pvmw_migration-block.patch removed from -mm tree
The patch titled
Subject: mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block
has been removed from the -mm tree. Its filename was
mm-page_vma_mapped_walk-prettify-pvmw_migration-block.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Hugh Dickins <[email protected]>
Subject: mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block
page_vma_mapped_walk() cleanup: rearrange the !pmd_present() block to follow the same "return not_found, return not_found, return true" pattern as the block above it (note: returning not_found there is never premature, since existence or prior existence of huge pmd guarantees good alignment).
---
mm/page_vma_mapped.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-)
mm/page_vma_mapped.c renamed from mm/page_vma_mapped.c~mm-page_vma_mapped_walk-prettify-pvmw_migration-block +14 -16
@@ -198,24 +198,22 @@ restart:if (pmd_page (pmde) != page)return not_found (pvmw);return true; - }else if (!pmd_present (pmde)) { -if (thp_migration_supported ()) { -if (!(pvmw->flags &PVMW_MIGRATION )) -return not_found (pvmw); -if (is_migration_entry (pmd_to_swp_entry (pmde))) { -swp_entry_t entry =pmd_to_swp_entry (pmde); + } +if (!pmd_present (pmde)) { +swp_entry_t entry; -if (migration_entry_to_page (entry) != page) -return not_found (pvmw); -return true; - } - } -return not_found (pvmw); - }else { -/* THP pmd was split under us: handle on pte level */ -spin_unlock (pvmw->ptl); - pvmw->ptl =NULL ; +if (!thp_migration_supported () || + !(pvmw->flags &PVMW_MIGRATION )) +return not_found (pvmw); + entry =pmd_to_swp_entry (pmde); +if (!is_migration_entry (entry) || +migration_entry_to_page (entry) != page) +return not_found (pvmw); +return true; } +/* THP pmd was split under us: handle on pte level */ +spin_unlock (pvmw->ptl); + pvmw->ptl =NULL ; }else if (!pmd_present (pmde)) {/* * If PVMW_SYNC, take and drop THP pmd lock so that we
_
Patches currently in -mm which might be from [email protected] are
mm-thp-remap_page-is-only-needed-on-anonymous-thp.patch mm-hwpoison_user_mappings-try_to_unmap-with-ttu_sync.patch