mm-memcg-drop-swp_entry_t-in-mc_handle_file_pte.patch removed from -mm tree
The patch titled
Subject: mm/memcg: drop swp_entry_t* in mc_handle_file_pte()
has been removed from the -mm tree. Its filename was
mm-memcg-drop-swp_entry_t-in-mc_handle_file_pte.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/memcg: drop swp_entry_t* in mc_handle_file_pte()
After the rework of f5df8635c5a3 ("mm: use find_get_incore_page in memcontrol", 2020-10-13) it's unused.
Signed-off-by Peter Xu <[email protected]>
Reviewed-by Muchun Song <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-drop-swp_entry_t-in-mc_handle_file_pte +2 -2
@@ -5545,7 +5545,7 @@ static struct page *mc_handle_swap_pte(s#endif static struct page *mc_handle_file_pte (struct vm_area_struct *vma, -unsigned long addr,pte_t ptent,swp_entry_t *entry) +unsigned long addr,pte_t ptent) {if (!vma->vm_file)/* anonymous vma */ return NULL ;
@@ -5718,7 +5718,7 @@ static enum mc_target_type get_mctgt_typelse if (is_swap_pte (ptent)) page =mc_handle_swap_pte (vma, ptent, &ent);else if (pte_none (ptent)) - page =mc_handle_file_pte (vma, addr, ptent, &ent); + page =mc_handle_file_pte (vma, addr, ptent);if (!page && !ent.val)return ret;
_
Patches currently in -mm which might be from [email protected] are