diff options
Diffstat (limited to 'meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch')
| -rw-r--r-- | meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch b/meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch deleted file mode 100644 index 93d608b81d..0000000000 --- a/meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch +++ /dev/null | |||
| @@ -1,57 +0,0 @@ | |||
| 1 | Upstream-Status: Backport | ||
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 3 | |||
| 4 | From 2b29be8ac41414ed19cb4f5d5626d9bd0d7b11a8 Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Cristian Stoica <cristian.stoica@nxp.com> | ||
| 6 | Date: Wed, 8 Feb 2017 12:11:04 +0200 | ||
| 7 | Subject: [PATCH] adjust to API changes in kernel >=4.10 | ||
| 8 | |||
| 9 | There are many changes related to get_user_pages and the code is rewritten | ||
| 10 | for clarity. | ||
| 11 | |||
| 12 | Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com> | ||
| 13 | --- | ||
| 14 | zc.c | 28 +++++++++++++++++----------- | ||
| 15 | 1 file changed, 17 insertions(+), 11 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/zc.c b/zc.c | ||
| 18 | index e766ee3..2f4ea99 100644 | ||
| 19 | --- a/zc.c | ||
| 20 | +++ b/zc.c | ||
| 21 | @@ -59,19 +59,25 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, | ||
| 22 | } | ||
| 23 | |||
| 24 | down_read(&mm->mmap_sem); | ||
| 25 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) | ||
| 26 | - ret = get_user_pages_remote( | ||
| 27 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) | ||
| 28 | + ret = get_user_pages(task, mm, | ||
| 29 | + (unsigned long)addr, pgcount, write, 0, pg, NULL); | ||
| 30 | #else | ||
| 31 | - ret = get_user_pages( | ||
| 32 | -#endif | ||
| 33 | - task, mm, | ||
| 34 | - (unsigned long)addr, pgcount, | ||
| 35 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) | ||
| 36 | - write ? FOLL_WRITE : 0, | ||
| 37 | -#else | ||
| 38 | - write, 0, | ||
| 39 | -#endif | ||
| 40 | +# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) | ||
| 41 | + ret = get_user_pages_remote(task, mm, | ||
| 42 | + (unsigned long)addr, pgcount, write, 0, pg, NULL); | ||
| 43 | +# else | ||
| 44 | +# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) | ||
| 45 | + ret = get_user_pages_remote(task, mm, | ||
| 46 | + (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, | ||
| 47 | pg, NULL); | ||
| 48 | +# else | ||
| 49 | + ret = get_user_pages_remote(task, mm, | ||
| 50 | + (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, | ||
| 51 | + pg, NULL, NULL); | ||
| 52 | +# endif | ||
| 53 | +# endif | ||
| 54 | +#endif | ||
| 55 | up_read(&mm->mmap_sem); | ||
| 56 | if (ret != pgcount) | ||
| 57 | return -EINVAL; | ||
