diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-09-01 09:24:24 -0400 |
---|---|---|
committer | jenkins-dontreply@build.automotivelinux.org <collab-it+agl-jobbuilder@linuxfoundation.org> | 2022-04-13 13:31:22 +0000 |
commit | 52dee07d74dba77e32b8728a5fdecf36e8fc6bc7 (patch) | |
tree | 6bcea92906c6df3c6e0e26bc44c186a4ebf43026 /recipes-kernel/sllin/files/0005-Fix-build-with-5.13-kernel.patch | |
parent | b72816c815207d0024db21381c0f4e2a3b177785 (diff) |
sllin: add patches for newer kernels
Add patches to enable building the sllin driver against kernels 5.13
and 5.14, or newer.
Bug-AGL: SPEC-3819
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: If48df12b0303556c5a74108d9247d5233d7bf5e5
Diffstat (limited to 'recipes-kernel/sllin/files/0005-Fix-build-with-5.13-kernel.patch')
-rw-r--r-- | recipes-kernel/sllin/files/0005-Fix-build-with-5.13-kernel.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-kernel/sllin/files/0005-Fix-build-with-5.13-kernel.patch b/recipes-kernel/sllin/files/0005-Fix-build-with-5.13-kernel.patch new file mode 100644 index 000000000..511470810 --- /dev/null +++ b/recipes-kernel/sllin/files/0005-Fix-build-with-5.13-kernel.patch @@ -0,0 +1,24 @@ +Remove TTY_LDISC_MAGIC usage + +The 5.13 kernel removed the .magic field from tty_ldisc_ops and +the associated TTY_LDISC_MAGIC #define, so remove their use when +building for 5.13 or newer. + +Upstream-Status: Inappropriate [no upstream] +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +--- +diff --git a/sllin/sllin.c b/sllin/sllin.c +index 92c52ad..904cff9 100644 +--- a/sllin/sllin.c ++++ b/sllin/sllin.c +@@ -1619,7 +1619,9 @@ static int sllin_ioctl(struct tty_struct *tty, struct file *file, + + static struct tty_ldisc_ops sll_ldisc = { + .owner = THIS_MODULE, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,13,0) + .magic = TTY_LDISC_MAGIC, ++#endif + .name = "sllin", + .open = sllin_open, + .close = sllin_close, |