diff options
Diffstat (limited to 'meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.9-rc1.patch')
-rw-r--r-- | meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.9-rc1.patch | 42 |
1 files changed, 42 insertions, 0 deletions
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 @@ | |||
1 | From 2f5e08aebf9229599aae7f25db752f74221cd71d Mon Sep 17 00:00:00 2001 | ||
2 | From: Joan Bruguera <joanbrugueram@gmail.com> | ||
3 | Date: Fri, 14 Aug 2020 00:13:38 +0200 | ||
4 | Subject: [PATCH] Fix build for Linux 5.9-rc1 | ||
5 | |||
6 | See 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 | |||
10 | Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com> | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/2f5e08aebf9229599aae7f25db752f74221cd71d] | ||
13 | |||
14 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
15 | |||
16 | --- | ||
17 | zc.c | 6 +++++- | ||
18 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/zc.c b/zc.c | ||
21 | index 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 | -- | ||
41 | 2.17.1 | ||
42 | |||