All of lore.kernel.org
 help / color / mirror / Atom feed
From: Denys Dmytriyenko <denis@denix.org>
To: meta-arago@arago-project.org
Subject: [master][PATCH 02/12] Revert "cryptodev: backport patch for user page API change in recent kernels"
Date: Thu,  2 Mar 2017 21:58:55 -0500	[thread overview]
Message-ID: <1488509945-12853-3-git-send-email-denis@denix.org> (raw)
In-Reply-To: <1488509945-12853-1-git-send-email-denis@denix.org>

From: Denys Dmytriyenko <denys@ti.com>

This reverts commit 5e120638b973c8f5edbb53cca587c9050e1c4750.
---
 .../cryptodev/cryptodev-module_%.bbappend          |  6 +---
 ...st-to-another-change-in-the-user-page-API.patch | 40 ----------------------
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch

diff --git a/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend b/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
index 02bf90b..f8a35cd 100644
--- a/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-module_%.bbappend
@@ -1,7 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-PR_append = ".arago1"
+PR_append = ".arago2"
 
 KERNEL_MODULE_AUTOLOAD += "cryptodev"
-
-SRC_URI += "file://0001-Adjust-to-another-change-in-the-user-page-API.patch"
diff --git a/meta-arago-distro/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch b/meta-arago-distro/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch
deleted file mode 100644
index fb75278..0000000
--- a/meta-arago-distro/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f126e4837e6334d0464540995df7426fedf6b175 Mon Sep 17 00:00:00 2001
-From: Michael Weiser <michael.weiser@gmx.de>
-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
-
-Upstream-Status: Backport
-
-Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
----
- zc.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/zc.c b/zc.c
-index a97b49f..e766ee3 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;
--- 
-1.9.1
-
-- 
2.7.4



  parent reply	other threads:[~2017-03-03  2:59 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-03  2:58 [master][PATCH 00/12] various fixes for latest master Denys Dmytriyenko
2017-03-03  2:58 ` [master][PATCH 01/12] libnl: update bbappend for 3.2.29 Denys Dmytriyenko
2017-03-03  2:58 ` Denys Dmytriyenko [this message]
2017-03-03  2:58 ` [master][PATCH 03/12] packagegroup-*-test: iperf is already in base-tisdk packagegroup Denys Dmytriyenko
2017-03-03  2:58 ` [master][PATCH 04/12] packagegroup-*-base-tisdk: iperf was replaced by iperf3 Denys Dmytriyenko
2017-03-03  2:58 ` [master][PATCH 05/12] packagegroup-*-connectivity: crda was blacklisted upstream for breakage Denys Dmytriyenko
2017-03-03  3:06   ` Denys Dmytriyenko
2017-03-03  2:58 ` [master][PATCH 06/12] images: disable matrix, as php was blacklised " Denys Dmytriyenko
2017-03-03  3:06   ` Denys Dmytriyenko
2017-03-03  2:59 ` [master][PATCH 07/12] packagegroup-*-base: alsa-lib no longer provides smixer libs, depend directly on libasound Denys Dmytriyenko
2017-03-03  2:59 ` [master][PATCH 08/12] arago.conf: qtwayland 5.8 now requires qtbase with xkbcommon-evdev PACKAGECONFIG Denys Dmytriyenko
2017-03-03  2:59 ` [master][PATCH 09/12] packagegroup-*-qte: use qtdeclarative-qmlplugins instead of -plugins Denys Dmytriyenko
2017-03-03  3:05   ` Denys Dmytriyenko
2017-03-03  2:59 ` [master][PATCH 10/12] toolchain-gcc: update preferences to current versions Denys Dmytriyenko
2017-03-03  2:59 ` [master][PATCH 11/12] arago-prefs: prefer latest libnl version Denys Dmytriyenko
2017-03-03  2:59 ` [master][PATCH 12/12] arago-prefs: update gstreamer preference to 1.10.4 Denys Dmytriyenko
  -- strict thread matches above, loose matches on Subject: below --
2017-03-21  1:42 [master][PATCH 01/12] libnl: update bbappend for 3.2.29 Denys Dmytriyenko
2017-03-21  1:42 ` [master][PATCH 02/12] Revert "cryptodev: backport patch for user page API change in recent kernels" Denys Dmytriyenko
2017-03-03  1:27 [master][PATCH 00/12] various fixes for latest master Denys Dmytriyenko
2017-03-03  1:27 ` [master][PATCH 02/12] Revert "cryptodev: backport patch for user page API change in recent kernels" Denys Dmytriyenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1488509945-12853-3-git-send-email-denis@denix.org \
    --to=denis@denix.org \
    --cc=meta-arago@arago-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.