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 9ACBBC04E69 for ; Mon, 17 Jul 2023 19:54:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230283AbjGQTyG (ORCPT ); Mon, 17 Jul 2023 15:54:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230464AbjGQTyD (ORCPT ); Mon, 17 Jul 2023 15:54:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70B02134; Mon, 17 Jul 2023 12:54:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0E4EE61245; Mon, 17 Jul 2023 19:54:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 613A2C43395; Mon, 17 Jul 2023 19:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1689623641; bh=ZWJkH459SqihnkY98eU9TtJ0/+5JtwdKVI+a8Enk9h8=; h=Date:To:From:Subject:From; b=SRw+Pdi00TXrtYVSiiX3LK4OxgqmYrhOq8k1KGTkwvreQy7otArLArPwy8AKxOHB0 9gmCIfzNXrebZ5Q921iH4Y9h35sbAFEYTMjS0374dBXMB3ihQ72lBXa0hWrSKj9dzE NUn6AlIoUD2o7B8eQZWOUFPn55dxkFemdXcOrd7c= Date: Mon, 17 Jul 2023 12:54:00 -0700 To: mm-commits@vger.kernel.org, stable@vger.kernel.org, Liam.Howlett@oracle.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] maple_tree-fix-node-allocation-testing-on-32-bit.patch removed from -mm tree Message-Id: <20230717195401.613A2C43395@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: maple_tree: fix node allocation testing on 32 bit has been removed from the -mm tree. Its filename was maple_tree-fix-node-allocation-testing-on-32-bit.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: "Liam R. Howlett" Subject: maple_tree: fix node allocation testing on 32 bit Date: Wed, 12 Jul 2023 13:39:16 -0400 Internal node counting was altered and the 64 bit test was updated, however the 32bit test was missed. Restore the 32bit test to a functional state. Link: https://lore.kernel.org/linux-mm/CAMuHMdV4T53fOw7VPoBgPR7fP6RYqf=CBhD_y_vOg53zZX_DnA@mail.gmail.com/ Link: https://lkml.kernel.org/r/20230712173916.168805-2-Liam.Howlett@oracle.com Fixes: 541e06b772c1 ("maple_tree: remove GFP_ZERO from kmem_cache_alloc() and kmem_cache_alloc_bulk()") Signed-off-by: Liam R. Howlett Cc: Signed-off-by: Andrew Morton --- tools/testing/radix-tree/maple.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/tools/testing/radix-tree/maple.c~maple_tree-fix-node-allocation-testing-on-32-bit +++ a/tools/testing/radix-tree/maple.c @@ -206,9 +206,9 @@ static noinline void __init check_new_no e = i - 1; } else { if (i >= 4) - e = i - 4; - else if (i == 3) - e = i - 2; + e = i - 3; + else if (i >= 1) + e = i - 1; else e = 0; } _ Patches currently in -mm which might be from Liam.Howlett@oracle.com are mm-mmap-clean-up-validate_mm-calls.patch maple_tree-relax-lockdep-checks-for-on-stack-trees.patch mm-mmap-change-detached-vma-locking-scheme.patch maple_tree-be-more-strict-about-locking.patch