summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2021-03-26 14:58:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-06 22:45:36 +0100
commit76008007da481aa2f9c74d3f5c817b2242110763 (patch)
tree693eaa6b7c0bd3b841213f3f92b48154f13ebc2b
parent9d14d7d1c170c0f1c3ccf142b499ce85c24a252c (diff)
downloadpoky-76008007da481aa2f9c74d3f5c817b2242110763.tar.gz
cryptodev-module: fix build failure with kernel v5.10
zc.c:77:8: error: too many arguments to function 'get_user_pages_remote' | 77 | ret = get_user_pages_remote(task, mm, | | ^~~~~~~~~~~~~~~~~~~~~ Backported patch to fix it. (From OE-Core rev: cd247306566313517b69b4ae321476b8ea9ab46f) Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb1
-rw-r--r--meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.9-rc1.patch42
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
index 6474599c45..e4f7d1e372 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.10.bb
@@ -10,6 +10,7 @@ DEPENDS += "cryptodev-linux"
10SRC_URI += " \ 10SRC_URI += " \
11file://0001-Disable-installing-header-file-provided-by-another-p.patch \ 11file://0001-Disable-installing-header-file-provided-by-another-p.patch \
12file://0001-Fix-build-for-Linux-5.8-rc1.patch \ 12file://0001-Fix-build-for-Linux-5.8-rc1.patch \
13file://0001-Fix-build-for-Linux-5.9-rc1.patch \
13" 14"
14 15
15EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' 16EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.9-rc1.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.9-rc1.patch
new file mode 100644
index 0000000000..cf1c04df9e
--- /dev/null
+++ b/meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.9-rc1.patch
@@ -0,0 +1,42 @@
1From 2f5e08aebf9229599aae7f25db752f74221cd71d Mon Sep 17 00:00:00 2001
2From: Joan Bruguera <joanbrugueram@gmail.com>
3Date: Fri, 14 Aug 2020 00:13:38 +0200
4Subject: [PATCH] Fix build for Linux 5.9-rc1
5
6See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=64019a2e467a288a16b65ab55ddcbf58c1b00187
7 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bce617edecada007aee8610fbe2c14d10b8de2f6
8 https://lore.kernel.org/lkml/CAHk-=wj_V2Tps2QrMn20_W0OJF9xqNh52XSGA42s-ZJ8Y+GyKw@mail.gmail.com/
9
10Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
11
12Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/2f5e08aebf9229599aae7f25db752f74221cd71d]
13
14Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
15
16---
17 zc.c | 6 +++++-
18 1 file changed, 5 insertions(+), 1 deletion(-)
19
20diff --git a/zc.c b/zc.c
21index a560db5..fdf7da1 100644
22--- a/zc.c
23+++ b/zc.c
24@@ -76,10 +76,14 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
25 ret = get_user_pages_remote(task, mm,
26 (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
27 pg, NULL);
28-#else
29+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0))
30 ret = get_user_pages_remote(task, mm,
31 (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
32 pg, NULL, NULL);
33+#else
34+ ret = get_user_pages_remote(mm,
35+ (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
36+ pg, NULL, NULL);
37 #endif
38 #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
39 up_read(&mm->mmap_sem);
40--
412.17.1
42