The patch titled
Subject: thp-clean-up-__collapse_huge_page_isolate v2
has been removed from the -mm tree. Its filename was
thp-clean-up-__collapse_huge_page_isolate-v2.patch
This patch was dropped because it was folded into thp-clean-up-__collapse_huge_page_isolate.patch
------------------------------------------------------
From: Bob Liu <lliubbo@xxxxxxxxx>
Subject: thp-clean-up-__collapse_huge_page_isolate v2
mv label out of condition.
Signed-off-by: Bob Liu <lliubbo@xxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Minchan Kim <minchan.kim@xxxxxxxxx>
Cc: Ni zhan Chen <nizhan.chen@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/huge_memory.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN mm/huge_memory.c~thp-clean-up-__collapse_huge_page_isolate-v2 mm/huge_memory.c
--- a/mm/huge_memory.c~thp-clean-up-__collapse_huge_page_isolate-v2
+++ a/mm/huge_memory.c
@@ -1871,7 +1871,7 @@ static int __collapse_huge_page_isolate(
{
struct page *page;
pte_t *_pte;
- int referenced = 0, isolated = 1, none = 0;
+ int referenced = 0, none = 0;
for (_pte = pte; _pte < pte+HPAGE_PMD_NR;
_pte++, address += PAGE_SIZE) {
pte_t pteval = *_pte;
@@ -1920,12 +1920,11 @@ static int __collapse_huge_page_isolate(
mmu_notifier_test_young(vma->vm_mm, address))
referenced = 1;
}
- if (unlikely(!referenced)) {
+ if (likely(referenced))
+ return 1;
out:
- release_pte_pages(pte, _pte);
- isolated = 0;
- }
- return isolated;
+ release_pte_pages(pte, _pte);
+ return 0;
}
static void __collapse_huge_page_copy(pte_t *pte, struct page *page,
_
Patches currently in -mm which might be from lliubbo@xxxxxxxxx are
thp-clean-up-__collapse_huge_page_isolate.patch
mm-introduce-mm_find_pmd.patch
mm-introduce-mm_find_pmd-fix.patch
thp-introduce-hugepage_vma_check.patch
thp-cleanup-introduce-mk_huge_pmd.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
