The quilt patch titled
Subject: mm/hugetlb: remove unused local variable dst_entry in copy_hugetlb_page_range()
has been removed from the -mm tree. Its filename was
mm-hugetlb-make-detecting-shared-pte-more-reliable-fix.patch
This patch was dropped because it was folded into mm-hugetlb-make-detecting-shared-pte-more-reliable.patch
------------------------------------------------------
From: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
Subject: mm/hugetlb: remove unused local variable dst_entry in copy_hugetlb_page_range()
Date: Mon, 22 Aug 2022 10:25:25 +0200
Commit a0e4f7b82610 ("mm/hugetlb: make detecting shared pte more
reliable") modifies copy_hugetlb_page_range() such that
huge_ptep_get(dst_pte) and the local variable dst_entry is not used
explicitly in this function.
Remove this unused local variable dst_entry in copy_hugetlb_page_range().
No functional change.
Link: https://lkml.kernel.org/r/20220822082525.26071-1-lukas.bulwahn@xxxxxxxxx
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
Reviewed-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/mm/hugetlb.c~mm-hugetlb-make-detecting-shared-pte-more-reliable-fix
+++ a/mm/hugetlb.c
@@ -4750,7 +4750,7 @@ int copy_hugetlb_page_range(struct mm_st
struct vm_area_struct *dst_vma,
struct vm_area_struct *src_vma)
{
- pte_t *src_pte, *dst_pte, entry, dst_entry;
+ pte_t *src_pte, *dst_pte, entry;
struct page *ptepage;
unsigned long addr;
bool cow = is_cow_mapping(src_vma->vm_flags);
@@ -4810,7 +4810,6 @@ int copy_hugetlb_page_range(struct mm_st
src_ptl = huge_pte_lockptr(h, src, src_pte);
spin_lock_nested(src_ptl, SINGLE_DEPTH_NESTING);
entry = huge_ptep_get(src_pte);
- dst_entry = huge_ptep_get(dst_pte);
again:
if (huge_pte_none(entry)) {
/*
@@ -4893,7 +4892,7 @@ again:
restore_reserve_on_error(h, dst_vma, addr,
new);
put_page(new);
- /* dst_entry won't change as in child */
+ /* huge_ptep of dst_pte won't change as in child */
goto again;
}
hugetlb_install_page(dst_vma, dst_pte, addr, new);
_
Patches currently in -mm which might be from lukas.bulwahn@xxxxxxxxx are
mm-hugetlb-make-detecting-shared-pte-more-reliable.patch
proc-make-config-proc_children-depend-on-proc_fs.patch
