From d3921c0fde334dcd67e92cdc955c254525ab62d0 Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Fri, 29 Mar 2019 15:30:19 +0100 Subject: backports: support changes to 4.4 longterm Changes to the mm subsystem in 4.4.168 broke backports Signed-off-by: Dominik Sliwa --- backport/backport-include/linux/mm.h | 4 ++-- 1 file 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, -- cgit v1.2.3