Skip to contentSkip to conversation

tools-fix-userspace-compilation-with-new-test_xarray-changes.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message May 6, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: tools: fix userspace compilation with new test_xarray changes
has been removed from the -mm tree. Its filename was
tools-fix-userspace-compilation-with-new-test_xarray-changes.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: Luis Chamberlain <[email protected]>
Subject: tools: fix userspace compilation with new test_xarray changes
Date: Tue, 23 Apr 2024 12:22:20 -0700

Patch series "test_xarray: couple of fixes for v6-9-rc6", v2.

Here are a couple of fixes which should be merged into the queue for v6.9-rc6. The first one was reported by Liam, after fixing that I noticed an issue with a test, and a fix for that is in the second patch.

This patch (of 2):

Liam reported that compiling the test_xarray on userspace was broken. I was not even aware that was possible but you can via and you can run these tests in userspace with:

make -C tools/testing/radix-tree
./tools/testing/radix-tree/xarray

Add the two helpers we need to fix compilation. We don't need a userspace schedule() so just make it do nothing.

Fixes a60cc288a1a2 ("test_xarray: add tests for advanced multi-index use")
Cc Daniel Gomez <[email protected]>
Cc Darrick J. Wong <[email protected]>
Cc Dave Chinner <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Pankaj Raghav <[email protected]>

---

 tools/testing/radix-tree/linux/kernel.h |    2 ++
 1 file changed, 2 insertions(+)
tools/testing/radix-tree/linux/kernel.h renamed from tools/testing/radix-tree/linux/kernel.h~tools-fix-userspace-compilation-with-new-test_xarray-changes +2 -0
@@ -18,6 +18,8 @@
 #define pr_info printk
 #define pr_debug printk
 #define pr_cont printk
+#define schedule()
+#define PAGE_SHIFT	12
 
 #define __acquires(x)
 #define __releases(x)

_

Patches currently in -mm which might be from [email protected] are