diff mbox series

[meta-ti,master,v2,5/5] gdbserverproxy-module-drv: Add support for kernel 6.15+

Message ID 20251211202234.4064350-5-reatmon@ti.com
State New
Headers show
Series [meta-ti,master,v2,1/5] linux-ti-staging: Add initial 6.18 recipes for LTS development | expand

Commit Message

Ryan Eatmon Dec. 11, 2025, 8:22 p.m. UTC
Add a patch to support a kernel change in 6.15:

- removed del_timer() in favor of timer_delete().

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
v2: New commit.

 .../0003-Support-Linux-kernels-v6.15.patch    | 34 +++++++++++++++++++
 .../gdbc6x/gdbserverproxy-module-drv_git.bb   |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0003-Support-Linux-kernels-v6.15.patch
diff mbox series

Patch

diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0003-Support-Linux-kernels-v6.15.patch b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0003-Support-Linux-kernels-v6.15.patch
new file mode 100644
index 00000000..8a8a739b
--- /dev/null
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv/0003-Support-Linux-kernels-v6.15.patch
@@ -0,0 +1,34 @@ 
+From cc151e69fe77b7e590bac9e5cf1eb00af9b92d83 Mon Sep 17 00:00:00 2001
+From: Ryan Eatmon <reatmon@ti.com>
+Date: Thu, 11 Dec 2025 11:14:50 -0600
+Subject: [PATCH] Support Linux kernels v6.15+
+
+del_timer was removed, switch to timer_delete.
+
+Upstream-Status: Inactive-Upstream
+
+Signed-off-by: Ryan Eatmon <reatmon@ti.com>
+---
+ kernel_module/gdbproxy-mod/gdbserverproxy.c | 15 ++++++++++++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/kernel_module/gdbproxy-mod/gdbserverproxy.c b/kernel_module/gdbproxy-mod/gdbserverproxy.c
+index 418b6db..8c5110b 100644
+--- a/kernel_module/gdbproxy-mod/gdbserverproxy.c
++++ b/kernel_module/gdbproxy-mod/gdbserverproxy.c
+@@ -462,7 +462,11 @@ static void gdb_close(struct tty_struct *tty, struct file *filp)
+                // this signifies the last device closing
+                if (gdb_port.openDevices == 0) {
+                     // release the timer
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0))
++                    timer_delete(&timer);
++#else
+                     del_timer(&timer);
++#endif
+ 
+                     // unmap the interrupt and set the address to NULL
+                     if(gdb_port.handleInt != NULL) {
+
+-- 
+2.43.0
+
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
index 799ba019..71f0c294 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
@@ -7,6 +7,7 @@  PV:append = "+git"
 SRC_URI:append = "\
     file://0001-Support-Linux-kernels-v5.15.patch;patchdir=../.. \
     file://0002-Support-Linux-kernels-v6.6.patch;patchdir=../.. \
+    file://0003-Support-Linux-kernels-v6.15.patch;patchdir=../.. \
 "
 
 S:append = "/kernel_module/gdbproxy-mod"