summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2021-05-05 03:34:20 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-05 20:27:21 +0200
commit75f83783bfdf2ddb3ffbf79ba44d506fb5b5548f (patch)
tree42700400686ceb7594ba669a454e79e5d521382e
parentkhugepaged: remove unnecessary out label in collapse_huge_page() (diff)
downloadlinux-75f83783bfdf2ddb3ffbf79ba44d506fb5b5548f.tar.xz
linux-75f83783bfdf2ddb3ffbf79ba44d506fb5b5548f.zip
khugepaged: remove meaningless !pte_present() check in khugepaged_scan_pmd()
We know it must meet the !is_swap_pte() and !pte_none() condition if we reach here. Since !is_swap_pte() indicates pte_none() or pte_present() is met, it's guaranteed that pte must be present here. Link: https://lkml.kernel.org/r/20210325135647.64106-4-linmiaohe@huawei.com Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Zi Yan <ziy@nvidia.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/khugepaged.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 276ac0099e19..a03569eda183 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1271,10 +1271,6 @@ static int khugepaged_scan_pmd(struct mm_struct *mm,
goto out_unmap;
}
}
- if (!pte_present(pteval)) {
- result = SCAN_PTE_NON_PRESENT;
- goto out_unmap;
- }
if (pte_uffd_wp(pteval)) {
/*
* Don't collapse the page if any of the small