From: Khalid Aziz <khalid.aziz@xxxxxxxxxx>
Date: Wed, 9 Aug 2017 15:25:55 -0600
@@ -1399,6 +1399,12 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
(flags & TTU_MIGRATION)) {
swp_entry_t entry;
pte_t swp_pte;
+
+ if (arch_unmap_one(mm, vma, address, pteval) < 0) {
+ set_pte_at(mm, address, pvmw.pte, pteval);
+ ret = false;
+ page_vma_mapped_walk_done(&pvmw);
+ break;
/*
* Store the pfn of the page in a special migration
* pte. do_swap_page() will wait until the migration
@@ -1410,6 +1416,7 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
if (pte_soft_dirty(pteval))
swp_pte = pte_swp_mksoft_dirty(swp_pte);
set_pte_at(mm, address, pvmw.pte, swp_pte);
+ }
This basic block doesn't look right. I think the new closing brace is
intended to be right after the new break; statement. If not at the
very least the indentation of the existing code in there needs to be
adjusted.