From d822f1cb090541c61faebb2cab32b380558a8295 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Dec 2018 09:58:23 +0100 Subject: [PATCH] 4.4-stable patches added patches: mm-nommu.c-switch-__get_user_pages_unlocked-to-use-__get_user_pages.patch --- ...ges_unlocked-to-use-__get_user_pages.patch | 30 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 31 insertions(+) create mode 100644 queue-4.4/mm-nommu.c-switch-__get_user_pages_unlocked-to-use-__get_user_pages.patch diff --git a/queue-4.4/mm-nommu.c-switch-__get_user_pages_unlocked-to-use-__get_user_pages.patch b/queue-4.4/mm-nommu.c-switch-__get_user_pages_unlocked-to-use-__get_user_pages.patch new file mode 100644 index 00000000000..ed6f02c582d --- /dev/null +++ b/queue-4.4/mm-nommu.c-switch-__get_user_pages_unlocked-to-use-__get_user_pages.patch @@ -0,0 +1,30 @@ +From 0d0afe933f60f5736c984e9171214aa34b18764c Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sun, 16 Dec 2018 23:50:08 +0000 +Subject: mm/nommu.c: Switch __get_user_pages_unlocked() to use __get_user_pages() + +From: Ben Hutchings + +Extracted from commit cde70140fed8 "mm/gup: Overload get_user_pages() +functions". This is needed before picking commit 768ae309a961 +"mm: replace get_user_pages() write/force parameters with gup_flags". + +Signed-off-by: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + mm/nommu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/mm/nommu.c ++++ b/mm/nommu.c +@@ -215,8 +215,8 @@ long __get_user_pages_unlocked(struct ta + { + long ret; + down_read(&mm->mmap_sem); +- ret = get_user_pages(tsk, mm, start, nr_pages, write, force, +- pages, NULL); ++ ret = __get_user_pages(tsk, mm, start, nr_pages, gup_flags, pages, ++ NULL, NULL); + up_read(&mm->mmap_sem); + return ret; + } diff --git a/queue-4.4/series b/queue-4.4/series index 3195456b265..3db6282eea8 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -72,6 +72,7 @@ swiotlb-clean-up-reporting.patch sr-pass-down-correctly-sized-scsi-sense-buffer.patch mm-remove-write-force-parameters-from-__get_user_pages_locked.patch mm-remove-write-force-parameters-from-__get_user_pages_unlocked.patch +mm-nommu.c-switch-__get_user_pages_unlocked-to-use-__get_user_pages.patch mm-replace-get_user_pages_unlocked-write-force-parameters-with-gup_flags.patch mm-replace-get_user_pages_locked-write-force-parameters-with-gup_flags.patch mm-replace-get_vaddr_frames-write-force-parameters-with-gup_flags.patch -- 2.47.3