mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
cryptodev: upgrade 1.10 -> 1.11
(From OE-Core rev: 7d1532e4dc0dfe78660bb076018847aaf3fa8f2f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ac0d5a8c0a
commit
ebee6e8953
|
|
@ -7,10 +7,8 @@ inherit module
|
|||
# Header file provided by a separate package
|
||||
DEPENDS += "cryptodev-linux"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-Disable-installing-header-file-provided-by-another-p.patch \
|
||||
file://0001-Fix-build-for-Linux-5.8-rc1.patch \
|
||||
"
|
||||
SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.patch \
|
||||
"
|
||||
|
||||
EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
|
||||
|
||||
|
|
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
|||
|
||||
SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \
|
||||
"
|
||||
SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b"
|
||||
SRCREV = "2299d39475e91392abd050ea09f2d20feecb4adf"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
From 9e765068582aae3696520346a7500322ca6cc2de Mon Sep 17 00:00:00 2001
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Sat, 13 Jun 2020 19:46:44 +0200
|
||||
Subject: [PATCH] Fix build for Linux 5.8-rc1
|
||||
|
||||
See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9740ca4e95b43b91a4a848694a20d01ba6818f7b
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=da1c55f1b272f4bd54671d459b39ea7b54944ef9
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d8ed45c5dcd455fc5848d47f86883a1b872ac0d0
|
||||
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
|
||||
Upstream-Status: Backport [9e765068582aae3696520346a7500322ca6cc2de]
|
||||
|
||||
Signed-off-by: He Zhe <zhe.he@windriver.com>
|
||||
---
|
||||
zc.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/zc.c b/zc.c
|
||||
index ae464ff..2c286bb 100644
|
||||
--- a/zc.c
|
||||
+++ b/zc.c
|
||||
@@ -58,7 +58,11 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
|
||||
down_read(&mm->mmap_sem);
|
||||
+#else
|
||||
+ mmap_read_lock(mm);
|
||||
+#endif
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0))
|
||||
ret = get_user_pages(task, mm,
|
||||
(unsigned long)addr, pgcount, write, 0, pg, NULL);
|
||||
@@ -74,7 +78,11 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
|
||||
(unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
||||
pg, NULL, NULL);
|
||||
#endif
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
|
||||
up_read(&mm->mmap_sem);
|
||||
+#else
|
||||
+ mmap_read_unlock(mm);
|
||||
+#endif
|
||||
if (ret != pgcount)
|
||||
return -EINVAL;
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user