mirror of
https://git.yoctoproject.org/poky
synced 2026-03-03 22:09:39 +01:00
e576212d25
Backport patch to fix: | cryptodev-module/1.10-r0/git/ioctl.c:875:4: error: implicit declaration of function 'ksys_close'; did you mean 'ksys_chown'? [-Werror=implicit-function-declaration] | 875 | ksys_close(fd); | | ^~~~~~~~~~ | | ksys_chown | cc1: some warnings being treated as errors (From OE-Core rev: 653b03aa6fc8effd3b2215a7a0ba005979e78e9f) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 55c6315058fc0dd189ffd116f2cc27ba4fa84cb6 Mon Sep 17 00:00:00 2001
|
|
From: Joan Bruguera <joanbrugueram@gmail.com>
|
|
Date: Mon, 28 Dec 2020 01:41:31 +0100
|
|
Subject: [PATCH] Fix build for Linux 5.11-rc1
|
|
|
|
ksys_close was removed, as far as I can tell, close_fd replaces it.
|
|
|
|
See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8760c909f54a82aaa6e76da19afe798a0c77c3c3
|
|
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1572bfdf21d4d50e51941498ffe0b56c2289f783
|
|
|
|
Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/55c6315058fc0dd189ffd116f2cc27ba4fa84cb6]
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
ioctl.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ioctl.c b/ioctl.c
|
|
index 3d332380..95481d4f 100644
|
|
--- a/ioctl.c
|
|
+++ b/ioctl.c
|
|
@@ -871,8 +871,10 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
|
|
if (unlikely(ret)) {
|
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0))
|
|
sys_close(fd);
|
|
-#else
|
|
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
|
|
ksys_close(fd);
|
|
+#else
|
|
+ close_fd(fd);
|
|
#endif
|
|
return ret;
|
|
}
|