Skip to contentSkip to conversation

maple_tree-fix-node-allocation-testing-on-32-bit.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Jul 17, 2023 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

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" <[email protected]>
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.

---

 tools/testing/radix-tree/maple.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/radix-tree/maple.c renamed from tools/testing/radix-tree/maple.c~maple_tree-fix-node-allocation-testing-on-32-bit +3 -3
@@ -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 [email protected] 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