Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A56CFC433F5 for ; Thu, 11 Nov 2021 02:41:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8964061884 for ; Thu, 11 Nov 2021 02:41:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234036AbhKKCoj (ORCPT ); Wed, 10 Nov 2021 21:44:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:50010 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234005AbhKKCoj (ORCPT ); Wed, 10 Nov 2021 21:44:39 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9D20B61284; Thu, 11 Nov 2021 02:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1636598510; bh=1IEmeocHa6R1uPoxOU4H4r6HphtUmin0MQuX7uK0yEM=; h=Date:From:To:Subject:From; b=XbWAuzYEPwAd00m+yIIK0TPQOCMcqmoDq05xLuNNaRpqgVVuEyyuCkudBgQBQecmt j69g+8aBU8swdtqQ/Uc7OVObPcD9i/GiXk8rZJ/cLTeIhq6Tgr/Lg+A2KRRgyu62vu GrEF6+/iBvDlTlroSQXbC8zv+1xhZ3ysee0x21Ak= Date: Wed, 10 Nov 2021 18:41:50 -0800 From: akpm@linux-foundation.org To: david@redhat.com, hannes@cmpxchg.org, mhocko@kernel.org, mm-commits@vger.kernel.org, peterx@redhat.com, songmuchun@bytedance.com, willy@infradead.org Subject: [merged] mm-memcg-drop-swp_entry_t-in-mc_handle_file_pte.patch removed from -mm tree Message-ID: <20211111024150.J-EnPU7n7%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org 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 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. Link: https://lkml.kernel.org/r/20210916193014.80129-1-peterx@redhat.com Signed-off-by: Peter Xu Reviewed-by: Muchun Song Reviewed-by: David Hildenbrand Cc: Johannes Weiner Cc: Michal Hocko Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/memcontrol.c~mm-memcg-drop-swp_entry_t-in-mc_handle_file_pte +++ a/mm/memcontrol.c @@ -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_typ else 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 peterx@redhat.com are