diff options
author | Stijn Segers <foss@volatilesystems.org> | 2020-12-24 14:06:17 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-01-01 19:55:59 +0100 |
commit | 59b5c52a6b77e3b6edd45f2526d55efbd0a04043 (patch) | |
tree | afc1009d753bd03f0232c4cd940e565e1fec5420 /package/kernel/cryptodev-linux/patches/010-fix-build-for-kernel-v5.9-rc1.patch | |
parent | f97b3ad7269a3c816469d8aca28145797084ea1e (diff) | |
download | upstream-59b5c52a6b77e3b6edd45f2526d55efbd0a04043.tar.gz upstream-59b5c52a6b77e3b6edd45f2526d55efbd0a04043.tar.bz2 upstream-59b5c52a6b77e3b6edd45f2526d55efbd0a04043.zip |
cryptodev-linux: bump to 1.11, fix build against kernel 5.10.
This patch bumps cryptodev-linux to the latest stable release (1.11) and fixes
compilation against the next LTS (and likely OpenWrt) kernel 5.10.
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'package/kernel/cryptodev-linux/patches/010-fix-build-for-kernel-v5.9-rc1.patch')
-rw-r--r-- | package/kernel/cryptodev-linux/patches/010-fix-build-for-kernel-v5.9-rc1.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/kernel/cryptodev-linux/patches/010-fix-build-for-kernel-v5.9-rc1.patch b/package/kernel/cryptodev-linux/patches/010-fix-build-for-kernel-v5.9-rc1.patch new file mode 100644 index 0000000000..09768a1f3a --- /dev/null +++ b/package/kernel/cryptodev-linux/patches/010-fix-build-for-kernel-v5.9-rc1.patch @@ -0,0 +1,32 @@ +From 2f5e08aebf9229599aae7f25db752f74221cd71d Mon Sep 17 00:00:00 2001 +From: Joan Bruguera <joanbrugueram@gmail.com> +Date: Fri, 14 Aug 2020 00:13:38 +0200 +Subject: [PATCH] Fix build for Linux 5.9-rc1 + +See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=64019a2e467a288a16b65ab55ddcbf58c1b00187 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bce617edecada007aee8610fbe2c14d10b8de2f6 + https://lore.kernel.org/lkml/CAHk-=wj_V2Tps2QrMn20_W0OJF9xqNh52XSGA42s-ZJ8Y+GyKw@mail.gmail.com/ + +Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com> +--- + zc.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/zc.c ++++ b/zc.c +@@ -76,10 +76,14 @@ int __get_userbuf(uint8_t __user *addr, + ret = get_user_pages_remote(task, mm, + (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, + pg, NULL); +-#else ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)) + ret = get_user_pages_remote(task, mm, + (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, + pg, NULL, NULL); ++#else ++ ret = get_user_pages_remote(mm, ++ (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); |