Received: by 2002:a05:7412:a9a8:b0:f9:92ae:e617 with SMTP id o40csp32854rdh; Wed, 20 Dec 2023 15:07:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IHe25cJY9sCux0fFvTK0E1Kid1cBTpkS9DHBzd4sTzV351arUt1tPBWCcfQ0Y5Ked/SMqoP X-Received: by 2002:a05:6e02:12ed:b0:35f:cbaf:c86b with SMTP id l13-20020a056e0212ed00b0035fcbafc86bmr1628865iln.51.1703113644329; Wed, 20 Dec 2023 15:07:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703113644; cv=none; d=google.com; s=arc-20160816; b=cLbdQRMrrgMz45E24QPgPR2kHTfDSpBYqo5N5DEvOjAQJc405eeHXWbeDuQWykmR3P E5U3zuohcmNLiw7zSP9iCANGXeFM5nLF8TV4pvR9FiTvQX3F/C3HF05VVqD8gDPkFU0S pkHB7BNhiNJao4VWjf7HyhvvpcovYL2P+My7D4uWYOUnGvfy1oOK015PLc4jQNcMxvjf VM3PdhFCMsQeAIZ7S/s1CpUAihpw5Wy9tDaJ2JmzdGfDdifySn/Tnl35HOpX33ga3+kQ drdolXZK7lrIalOYSEFmsCUgoJFkZcPde5LvAxJULxWTUujFv5vKbqnFRoWuOH2roUM0 M+bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=XNLi/aVY5jwoALWpPAveyLrvuNqr0potAPprV7oOzTs=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=R253sUNubcQhgugSk5GtzoZbJF2uaa8HtNRCY4JTcplGhjrI2aWCsApBiYPpgHemZ8 bXsnGoeDA3s9M7BeKSMwBdYMNiDF98f4i1qAIE/yNiqKqoz4ZmjqRu8xJa6I730g4rwN u7jidHR9Bpdn0BvN15YNyW0ERj5B0y8YMoVcqB4mNm6JdHw2tFvu9QEg270kam6qg6Az /yiQkg8vWH39hfOFCzMz2Dw4B6b6IipzIJW0wmODo4qrtOpASkXyz+nHVg8XPK2EcHez a7Io5eq/qQm/WT1W7/IipqAl1bqV+/eq/+AMXpAbZAfyyPJDCc9Q3LFLTiTpI7LQPjj6 CwIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cPCzWCGh; spf=pass (google.com: domain of linux-kernel+bounces-7578-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7578-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id bz16-20020a056a02061000b005ca186affebsi482766pgb.276.2023.12.20.15.07.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 15:07:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7578-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cPCzWCGh; spf=pass (google.com: domain of linux-kernel+bounces-7578-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7578-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id EA404B26C2C for ; Wed, 20 Dec 2023 23:00:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 01F4B6A011; Wed, 20 Dec 2023 22:46:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cPCzWCGh" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCD6C524AD for ; Wed, 20 Dec 2023 22:46:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XNLi/aVY5jwoALWpPAveyLrvuNqr0potAPprV7oOzTs=; b=cPCzWCGhYBjXL3G7dNK0iOctcACkKv+RqowPPQ4I8RAnDj4ZmzMfid8mABW6BMPTjPfynJ yOU/55pL/ENyaFO4ND+xLWcz4jgW0Rp+5zyKASVh3MVsESMbwLdFpt73GVJgc5KZ8APDq2 j3daiFrpPsjV0UA8jR1fkyzuFHn/OK0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-122-JReApqYgOjavD14OGWY4tg-1; Wed, 20 Dec 2023 17:46:17 -0500 X-MC-Unique: JReApqYgOjavD14OGWY4tg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D9391019C82; Wed, 20 Dec 2023 22:46:17 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5947140C6EB9; Wed, 20 Dec 2023 22:46:15 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu Subject: [PATCH v2 27/40] mm/ksm: page_remove_rmap() -> folio_remove_rmap_pte() Date: Wed, 20 Dec 2023 23:44:51 +0100 Message-ID: <20231220224504.646757-28-david@redhat.com> In-Reply-To: <20231220224504.646757-1-david@redhat.com> References: <20231220224504.646757-1-david@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Let's convert replace_page(). Signed-off-by: David Hildenbrand --- mm/ksm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/ksm.c b/mm/ksm.c index 146aa75fa6ff7..716e2f87dd795 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1449,7 +1449,7 @@ static int replace_page(struct vm_area_struct *vma, struct page *page, set_pte_at_notify(mm, addr, ptep, newpte); folio = page_folio(page); - page_remove_rmap(page, vma, false); + folio_remove_rmap_pte(folio, page, vma); if (!folio_mapped(folio)) folio_free_swap(folio); folio_put(folio); -- 2.43.0