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 F0E39C77B7D for ; Fri, 5 May 2023 22:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233361AbjEEWjK (ORCPT ); Fri, 5 May 2023 18:39:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232718AbjEEWjI (ORCPT ); Fri, 5 May 2023 18:39:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E74A5BA8 for ; Fri, 5 May 2023 15:39:07 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 1AF1564159 for ; Fri, 5 May 2023 22:39:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F806C433D2; Fri, 5 May 2023 22:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1683326346; bh=fJKvxhRAP8kxWkbFizszRaOzWWp28zwAGDtOdkiUFZg=; h=Date:To:From:Subject:From; b=Yn24P9qusgtp7wRpXrrK4PcaGxtXb54GRME9LnLk95t4nRwE8XhcN1TntWNmFcKQe ykKkHed5sExhn9pxpaVSJ/wBs+jqSuP2wHALk8L07nkjii28mLPP/iLJ5Yqxm05Tqh 0FrWRdBmCQ676qd97k34Lpcw6Ba070hUM8jCMDL8= Date: Fri, 05 May 2023 15:39:05 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, tonyb@cybernetics.com, hch@lst.de, kbusch@kernel.org, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] dmapool-consolidate-page-initialization.patch removed from -mm tree Message-Id: <20230505223906.6F806C433D2@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: dmapool: consolidate page initialization has been removed from the -mm tree. Its filename was dmapool-consolidate-page-initialization.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: Keith Busch Subject: dmapool: consolidate page initialization Date: Thu, 26 Jan 2023 13:51:21 -0800 Various fields of the dma pool are set in different places. Move it all to one function. Link: https://lkml.kernel.org/r/20230126215125.4069751-9-kbusch@meta.com Fixes: 2d55c16c0c54 ("dmapool: create/destroy cleanup") Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig Cc: Matthew Wilcox Cc: Tony Battersby Signed-off-by: Andrew Morton --- mm/dmapool.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/mm/dmapool.c~dmapool-consolidate-page-initialization +++ a/mm/dmapool.c @@ -274,6 +274,9 @@ static void pool_initialise_page(struct unsigned int offset = 0; unsigned int next_boundary = pool->boundary; + pool_init_page(pool, page); + page->in_use = 0; + page->offset = 0; do { unsigned int next = offset + pool->size; if (unlikely((next + pool->size) >= next_boundary)) { @@ -300,11 +303,7 @@ static struct dma_page *pool_alloc_page( return NULL; } - pool_init_page(pool, page); pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; - return page; } _ Patches currently in -mm which might be from kbusch@kernel.org are