summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backport-include/linux/mm.h4
-rw-r--r--versions2
2 files changed, 3 insertions, 3 deletions
diff --git a/backport-include/linux/mm.h b/backport-include/linux/mm.h
index 587aa8d..1b0672b 100644
--- a/backport-include/linux/mm.h
+++ b/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,
diff --git a/versions b/versions
index e2998af..813bcad 100644
--- a/versions
+++ b/versions
@@ -1,3 +1,3 @@
-BACKPORTS_VERSION="v5.0-rc6-1-7-g515a1fa5"
+BACKPORTS_VERSION="v5.0-rc6-1-8-gd3921c0f"
BACKPORTED_KERNEL_VERSION="v4.19.24-0-gf287634fe321"
BACKPORTED_KERNEL_NAME="Linux"