diff options
Diffstat (limited to 'recipes-kernel/cryptodev/sdk_patches/0103-zc-Use-the-power-of-elif.patch')
| -rw-r--r-- | recipes-kernel/cryptodev/sdk_patches/0103-zc-Use-the-power-of-elif.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/recipes-kernel/cryptodev/sdk_patches/0103-zc-Use-the-power-of-elif.patch b/recipes-kernel/cryptodev/sdk_patches/0103-zc-Use-the-power-of-elif.patch new file mode 100644 index 000000000..5c1210775 --- /dev/null +++ b/recipes-kernel/cryptodev/sdk_patches/0103-zc-Use-the-power-of-elif.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From e2fa367d968926500584912e98cf7b17bd9487a6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Phil Sutter <phil@nwl.cc> | ||
| 3 | Date: Thu, 9 Feb 2017 11:40:46 +0100 | ||
| 4 | Subject: [PATCH 103/104] zc: Use the power of #elif | ||
| 5 | |||
| 6 | While here, get rid of that trailing newline as well. | ||
| 7 | |||
| 8 | Fixes: 2b29be8ac4141 ("adjust to API changes in kernel >=4.10") | ||
| 9 | Suggested-by: Frediano Ziglio <freddy77@gmail.com> | ||
| 10 | Signed-off-by: Phil Sutter <phil@nwl.cc> | ||
| 11 | --- | ||
| 12 | zc.c | 11 +++-------- | ||
| 13 | 1 file changed, 3 insertions(+), 8 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/zc.c b/zc.c | ||
| 16 | index 2f4ea99..ae464ff 100644 | ||
| 17 | --- a/zc.c | ||
| 18 | +++ b/zc.c | ||
| 19 | @@ -62,21 +62,17 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, | ||
| 20 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) | ||
| 21 | ret = get_user_pages(task, mm, | ||
| 22 | (unsigned long)addr, pgcount, write, 0, pg, NULL); | ||
| 23 | -#else | ||
| 24 | -# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) | ||
| 25 | +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) | ||
| 26 | ret = get_user_pages_remote(task, mm, | ||
| 27 | (unsigned long)addr, pgcount, write, 0, pg, NULL); | ||
| 28 | -# else | ||
| 29 | -# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) | ||
| 30 | +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) | ||
| 31 | ret = get_user_pages_remote(task, mm, | ||
| 32 | (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, | ||
| 33 | pg, NULL); | ||
| 34 | -# else | ||
| 35 | +#else | ||
| 36 | ret = get_user_pages_remote(task, mm, | ||
| 37 | (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, | ||
| 38 | pg, NULL, NULL); | ||
| 39 | -# endif | ||
| 40 | -# endif | ||
| 41 | #endif | ||
| 42 | up_read(&mm->mmap_sem); | ||
| 43 | if (ret != pgcount) | ||
| 44 | @@ -222,4 +218,3 @@ int get_userbuf(struct csession *ses, | ||
| 45 | } | ||
| 46 | return 0; | ||
| 47 | } | ||
| 48 | - | ||
| 49 | -- | ||
| 50 | 2.10.2 | ||
| 51 | |||
