diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2019-03-29 15:42:57 +0100 |
|---|---|---|
| committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2019-03-29 16:16:50 +0100 |
| commit | 04b0b4365fea6da59cdf1c8e9b6377c532ccd965 (patch) | |
| tree | a80135b8fb31e6e075bd7c069ac86af3e7c5b65b | |
| parent | 348fa3f6871f56a37dcd16c99ca98118c6d79a38 (diff) | |
Backports v4.19.24 v2Colibri-iMX7_LXDE-Image_2.8b6.184-20190401Colibri-iMX6_LXDE-Image_2.8b6.184-20190401Colibri-iMX6ULL_LXDE-Image_2.8b6.184-20190401Colibri-VF_LXDE-Image_2.8b6.183-20190331Colibri-T30_LXDE-Image_2.8b6.184-20190401Colibri-T20_LXDE-Image_2.8b6.184-20190401Apalis-iMX6_LXDE-Image_2.8b6.184-20190401Apalis-TK1_LXDE-Image_2.8b6.184-20190401Apalis-TK1_Console-Image_3.0b2.65-20190830Apalis-T30_LXDE-Image_2.8b6.184-20190401
Backports generated by toradex backports d3921c0fde334dcd67e92cdc955c254525ab62d0
against mainline kernel tag v4.19.24
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
| -rw-r--r-- | backport-include/linux/mm.h | 4 | ||||
| -rw-r--r-- | versions | 2 |
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, @@ -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" |