diff mbox series

[meta-arago,master,3/4] FIXME: ltp-ddt: Add support for 6.18 kernel headers

Message ID 20251230165135.3505628-3-reatmon@ti.com
State New
Headers show
Series [meta-arago,master,1/4] cifs-utils: Remove bbappend and patch | expand

Commit Message

Ryan Eatmon Dec. 30, 2025, 4:51 p.m. UTC
A spare struct variable is now being used, but one of the ltp-ddt tests
was referring to the "spare" name.

We need a better long term fix from ltp-ddt, but in the short term this
patch can get us building again.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 ...unt04-Update-for-6.18-kernel-headers.patch | 54 +++++++++++++++++++
 .../ltp-ddt/ltp-ddt_20250130.bb               |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/0001-listmount04-Update-for-6.18-kernel-headers.patch
diff mbox series

Patch

diff --git a/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/0001-listmount04-Update-for-6.18-kernel-headers.patch b/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/0001-listmount04-Update-for-6.18-kernel-headers.patch
new file mode 100644
index 00000000..2c002e40
--- /dev/null
+++ b/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt/0001-listmount04-Update-for-6.18-kernel-headers.patch
@@ -0,0 +1,54 @@ 
+From 2dab76490d8d9b30119204a6376e00176fad9b07 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Mon, 29 Dec 2025 12:42:29 -0600
+Subject: [PATCH] listmount04: Update for 6.18 kernel headers
+
+The spare slot is now being used as of the 6.18 kernel.
+
+Upstream-Status: Pending
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ testcases/kernel/syscalls/listmount/listmount04.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/testcases/kernel/syscalls/listmount/listmount04.c b/testcases/kernel/syscalls/listmount/listmount04.c
+index d38408d2c..2053532f6 100644
+--- a/testcases/kernel/syscalls/listmount/listmount04.c
++++ b/testcases/kernel/syscalls/listmount/listmount04.c
+@@ -28,7 +28,7 @@ static uint64_t mnt_ids[MNT_SIZE];
+ static struct tcase {
+ 	int req_usage;
+ 	uint32_t size;
+-	uint32_t spare;
++	uint32_t mnt_ns_fd;
+ 	uint64_t mnt_id;
+ 	uint64_t param;
+ 	uint64_t *mnt_ids;
+@@ -75,12 +75,12 @@ static struct tcase {
+ 	{
+ 		.req_usage = 1,
+ 		.size = MNT_ID_REQ_SIZE_VER0,
+-		.spare = -1,
++		.mnt_ns_fd = -1,
+ 		.mnt_id = LSMT_ROOT,
+ 		.mnt_ids = mnt_ids,
+ 		.nr_mnt_ids = MNT_SIZE,
+ 		.exp_errno = EINVAL,
+-		.msg = "invalid mnt_id_req.spare",
++		.msg = "invalid mnt_id_req.mnt_ns_fd",
+ 	},
+ 	{
+ 		.req_usage = 1,
+@@ -124,7 +124,7 @@ static void run(unsigned int n)
+ 		req->mnt_id = tc->mnt_id;
+ 		req->param = tc->param;
+ 		req->size = tc->size;
+-		req->spare = tc->spare;
++		req->mnt_ns_fd = tc->mnt_ns_fd;
+ 	}
+ 
+ 	TST_EXP_FAIL(tst_syscall(__NR_listmount, req, tc->mnt_ids,
+-- 
+2.43.0
+
diff --git a/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20250130.bb b/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20250130.bb
index d92bfb9b..11bbf13a 100644
--- a/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20250130.bb
+++ b/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20250130.bb
@@ -15,6 +15,8 @@  BRANCH ?= "master"
 SRC_URI:remove = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https"
 SRC_URI:prepend = "git://git.ti.com/git/test-automation/ltp-ddt.git;protocol=https;branch=${BRANCH} "
 
+SRC_URI += "file://0001-listmount04-Update-for-6.18-kernel-headers.patch"
+
 export prefix = "/opt/ltp"
 export exec_prefix = "/opt/ltp"