Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2740471rdb; Mon, 4 Dec 2023 06:24:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEeDFbA4268R+FHmYTZu+B5Y7h1hc80ZsXRxFdVx93iGhydeTjuUdNER/jqXCcA98JtU+2T X-Received: by 2002:a17:90b:3e8c:b0:285:25b3:4d5d with SMTP id rj12-20020a17090b3e8c00b0028525b34d5dmr1454666pjb.8.1701699887262; Mon, 04 Dec 2023 06:24:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701699887; cv=none; d=google.com; s=arc-20160816; b=OeSmYb+9aY97CN/W7X5zbvVgfeuN7iRVi4CjEl4vCWPYji4YkgWFEmzvdFOSODquOi bp+MthXpB3m4T0qfVJAUK5V6cHb9+whFReLAWqee/bUNkkmzL2UeC6VtNZvz+QLPomzg fq2u4mMHTlLAGj3TaXTLq8VoJmEHJFOBgPb070qZumHRf7QRFw1s6REZOcf/WbsxZQhb /WehA10guf/4nEU77+1J2cECXUs1FziPPye+oE/IahMQ/kGV8aipO0KCwI7L6EKaPUjq WK3wa5cVjohudGHvdF9pb/a81QemQUdhcaW0D4i5clELJ0nMdsA0fBWBi/eGaLSgCIIL qHfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IO1sF7V8N+lGKeYvOYG0Xi/4CGC4wNOlZZ1+xeF2jmE=; fh=UlFXU+hKOMcm6idRzNfe3Pu+B5L1f7aeir3C6i/NWQA=; b=NAacMyGBKK1ZvcFmwwYtXO1b50AtrOx8sXe6Hh/mRF43zWgJ0IV0NpmBBOrIAoCBry z5SPltLPN4I540cRHYK32A8TsSeK9VZFNlNa5w4/pO6W7K1169+46XCWD/b5PoIIqKAg CpnOceGrWr0mLSnivCDWaxcEW4XNIH1YZhhu0TB0zuvYM8c4WDi+0ZQnnsG8HQU55TYg DM2ke5fTvnqYMyrD+aF4z//lwq4Cl+123lqczXril/8LS0J+v6aO59AlwKJ2vAAOqYXG kVJfsj5+4pmKY6ntJ+DlNT4Ih8y7TkFTI7pWIru1W9UM3MfJo2nNOeRZMIOaL3HK3Ikt TW2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dlIijEOg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id nw4-20020a17090b254400b002856f3e5fe2si8363149pjb.3.2023.12.04.06.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 06:24:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dlIijEOg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 77CDF8096A70; Mon, 4 Dec 2023 06:24:44 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345600AbjLDOYV (ORCPT + 99 others); Mon, 4 Dec 2023 09:24:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235857AbjLDOXg (ORCPT ); Mon, 4 Dec 2023 09:23:36 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64C3210E4 for ; Mon, 4 Dec 2023 06:22:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701699765; 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=IO1sF7V8N+lGKeYvOYG0Xi/4CGC4wNOlZZ1+xeF2jmE=; b=dlIijEOgxDk40B2weiJNEqwQYsfVxJMvaiGQuCclUd/LumrZ+9yrMd0a8gQZaunCUXqZDM C/+uQPHhDU80t3x5OFEvxw1LhmHgrMasArQgXkRJ91fBfwn7zWYckqz8EofhQ/tXvFMVI9 EF3hfZ05ZeGUdON6pVS9u4EdNqpQPAA= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-EsHpcshiPLKnjsrxEa5ujA-1; Mon, 04 Dec 2023 09:22:40 -0500 X-MC-Unique: EsHpcshiPLKnjsrxEa5ujA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 C3E941C03D95; Mon, 4 Dec 2023 14:22:39 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.195.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2055C2026D68; Mon, 4 Dec 2023 14:22:38 +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 RFC 27/39] mm/ksm: page_remove_rmap() -> folio_remove_rmap_pte() Date: Mon, 4 Dec 2023 15:21:34 +0100 Message-ID: <20231204142146.91437-28-david@redhat.com> In-Reply-To: <20231204142146.91437-1-david@redhat.com> References: <20231204142146.91437-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 04 Dec 2023 06:24:44 -0800 (PST) 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 357944588a9a9..c23aed4f1a344 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1279,7 +1279,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.41.0