1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-30 15:30:28 +00:00

gdbc6x: Fix kernel module to work on v5.15+

Small changes, the "upstream" doesn't look to be maintained anymore,
so if we get any more breaks it might be time to remove this recipe.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2023-04-18 11:59:38 -05:00
committed by Ryan Eatmon
parent bc894bf52e
commit 76bd751f74
2 changed files with 42 additions and 0 deletions
@@ -0,0 +1,40 @@
From 7e6e1312629f9bc7a24871f7f395f2d288a1758f Mon Sep 17 00:00:00 2001
From: Andrew Davis <afd@ti.com>
Date: Tue, 18 Apr 2023 11:38:54 -0500
Subject: [PATCH] Support Linux kernels v5.15+
put_tty_driver was removed and write_room return type has changed.
Function tty_driver_kref_put has been around a while, so no need
to do a kernel version check.
Upstream-Status: Pending
Signed-off-by: Andrew Davis <afd@ti.com>
---
kernel_module/gdbproxy-mod/gdbserverproxy.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel_module/gdbproxy-mod/gdbserverproxy.c b/kernel_module/gdbproxy-mod/gdbserverproxy.c
index 418b6db..4b1c676 100644
--- a/kernel_module/gdbproxy-mod/gdbserverproxy.c
+++ b/kernel_module/gdbproxy-mod/gdbserverproxy.c
@@ -540,7 +540,11 @@ static int gdb_write(struct tty_struct *tty,
*
*
*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0))
+static unsigned int gdb_write_room(struct tty_struct *tty)
+#else
static int gdb_write_room(struct tty_struct *tty)
+#endif
{
return GDB_STR_SIZE;
}
@@ -914,7 +918,7 @@ static int __init gdb_dev_init(void)
if (ret < 0) {
printk(KERN_ERR "Couldn't register gdbtty driver.\n");
- put_tty_driver(tty_gdb_driver);
+ tty_driver_kref_put(tty_gdb_driver);
return ret;
}
@@ -7,6 +7,8 @@ MACHINE_KERNEL_PR:append = "b"
PR = "${MACHINE_KERNEL_PR}" PR = "${MACHINE_KERNEL_PR}"
PV:append = "+git${SRCPV}" PV:append = "+git${SRCPV}"
SRC_URI:append = " file://0001-Support-Linux-kernels-v5.15.patch;patchdir=../.."
S = "${WORKDIR}/git/kernel_module/gdbproxy-mod" S = "${WORKDIR}/git/kernel_module/gdbproxy-mod"
inherit module inherit module