From 2c39f48c517938a37d3518fb8aa2d8171de68263 Mon Sep 17 00:00:00 2001 From: Jose Diaz de Grenu Date: Thu, 28 Dec 2017 14:48:24 +0100 Subject: [PATCH] rocko migration: cryptodev: remove patch Cryptodev has been updated to version 1.9 and the patch is no longer needed. https://jira.digi.com/browse/DEL-5518 Signed-off-by: Jose Diaz de Grenu --- ...-another-change-in-the-user-page-API.patch | 32 ------------------- .../cryptodev/cryptodev-module_%.bbappend | 4 --- 2 files changed, 36 deletions(-) delete mode 100644 meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module/0002-Adjust-to-another-change-in-the-user-page-API.patch diff --git a/meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module/0002-Adjust-to-another-change-in-the-user-page-API.patch b/meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module/0002-Adjust-to-another-change-in-the-user-page-API.patch deleted file mode 100644 index 73313f380..000000000 --- a/meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module/0002-Adjust-to-another-change-in-the-user-page-API.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Michael Weiser -Date: Fri, 11 Nov 2016 18:09:32 +0100 -Subject: [PATCH] Adjust to another change in the user page API - -4.9.0 will replace the write and force flags of get_user_pages_remote() -with a gup_flags parameter[1]. Distinguish the two APIs based on kernel -version we're compiling for. - -[1] https://github.com/torvalds/linux/commit/9beae1ea89305a9667ceaab6d0bf46a045ad71e7 ---- - zc.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/zc.c b/zc.c -index a97b49f75327..e766ee3eabc7 100644 ---- a/zc.c -+++ b/zc.c -@@ -65,7 +65,13 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, - ret = get_user_pages( - #endif - task, mm, -- (unsigned long)addr, pgcount, write, 0, pg, NULL); -+ (unsigned long)addr, pgcount, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) -+ write ? FOLL_WRITE : 0, -+#else -+ write, 0, -+#endif -+ pg, NULL); - up_read(&mm->mmap_sem); - if (ret != pgcount) - return -EINVAL; diff --git a/meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module_%.bbappend b/meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module_%.bbappend index ce1d97772..23c454024 100644 --- a/meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module_%.bbappend +++ b/meta-digi-arm/recipes-kernel/cryptodev/cryptodev-module_%.bbappend @@ -1,7 +1,3 @@ # Copyright (C) 2016-2017 Digi International Inc. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI_append = " file://0002-Adjust-to-another-change-in-the-user-page-API.patch" - KERNEL_MODULE_AUTOLOAD = "cryptodev"