summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-03-29 14:58:52 +0000
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-03-29 14:58:52 +0000
commited44cf94df57e6c6ea819a54d291e0cb4c6d7fee (patch)
treed5348e9a7013083eae0c1e4753f9a3422dc401ea
parent515a1fa55cda2b1d952872e1786857481bd54fcc (diff)
parentd3921c0fde334dcd67e92cdc955c254525ab62d0 (diff)
Merge branch 'master' into 'master'HEADmaster
backports: support changes to 4.4 longterm See merge request rd/linux-bsp/backports-sources-toradex!2
-rw-r--r--backport/backport-include/linux/mm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/backport/backport-include/linux/mm.h b/backport/backport-include/linux/mm.h
index 587aa8dc..1b0672b5 100644
--- a/backport/backport-include/linux/mm.h
+++ b/backport/backport-include/linux/mm.h
@@ -19,7 +19,7 @@ long get_user_pages_locked(unsigned long start, unsigned long nr_pages,
#define get_user_pages_unlocked LINUX_BACKPORT(get_user_pages_unlocked)
long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
int write, int force, struct page **pages);
-#elif LINUX_VERSION_IS_LESS(4,6,0)
+#elif LINUX_VERSION_IS_LESS(4,6,0) && !LINUX_VERSION_IN_RANGE(4,4,168, 4,5,0)
static inline
long backport_get_user_pages_locked(unsigned long start, unsigned long nr_pages,
int write, int force, struct page **pages, int *locked)
@@ -39,7 +39,7 @@ long backport_get_user_pages_unlocked(unsigned long start, unsigned long nr_page
#define get_user_pages_unlocked LINUX_BACKPORT(get_user_pages_unlocked)
#endif
-#if LINUX_VERSION_IS_LESS(4,6,0)
+#if LINUX_VERSION_IS_LESS(4,6,0) && !LINUX_VERSION_IN_RANGE(4,4,168, 4,5,0)
static inline
long backport_get_user_pages(unsigned long start, unsigned long nr_pages,
int write, int force, struct page **pages,