From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E157C761A6 for ; Tue, 28 Mar 2023 23:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229959AbjC1XWE (ORCPT ); Tue, 28 Mar 2023 19:22:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229517AbjC1XVh (ORCPT ); Tue, 28 Mar 2023 19:21:37 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FA2530D5 for ; Tue, 28 Mar 2023 16:21:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CE6FCB81F56 for ; Tue, 28 Mar 2023 23:21:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DAFAC433D2; Tue, 28 Mar 2023 23:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1680045685; bh=jSnplRpInDF0YHPOhz0sSf1qWSn7yvT8fEKBufCcbrk=; h=Date:To:From:Subject:From; b=p5CluIM4SS/IABpzBEg6qKn0g6RC/Z2pGijP775xOoMAtX3PVcFMawXi/8AsSxnlB HtKFLAO7aQUjHd6V21O+0XOzeBDb8n6L26pjczmeopmn6Z8K+DGQSk25La5YMimyqU SjPYoafSCHZ7dMQHgMXd8fMuvmOxEjceFTytWlIM= Date: Tue, 28 Mar 2023 16:21:25 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, wangkefeng.wang@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-memory-use-folio_throttle_swaprate-in-do_cow_fault.patch removed from -mm tree Message-Id: <20230328232125.8DAFAC433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm: memory: use folio_throttle_swaprate() in do_cow_fault() has been removed from the -mm tree. Its filename was mm-memory-use-folio_throttle_swaprate-in-do_cow_fault.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Kefeng Wang Subject: mm: memory: use folio_throttle_swaprate() in do_cow_fault() Date: Thu, 2 Mar 2023 19:58:34 +0800 Directly use folio_throttle_swaprate() instead of cgroup_throttle_swaprate(). Link: https://lkml.kernel.org/r/20230302115835.105364-7-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang Reviewed-by: Matthew Wilcox (Oracle) Signed-off-by: Andrew Morton --- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memory.c~mm-memory-use-folio_throttle_swaprate-in-do_cow_fault +++ a/mm/memory.c @@ -4539,7 +4539,7 @@ static vm_fault_t do_cow_fault(struct vm put_page(vmf->cow_page); return VM_FAULT_OOM; } - cgroup_throttle_swaprate(vmf->cow_page, GFP_KERNEL); + folio_throttle_swaprate(page_folio(vmf->cow_page), GFP_KERNEL); ret = __do_fault(vmf); if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY))) _ Patches currently in -mm which might be from wangkefeng.wang@huawei.com are