From aa10cb2c1fd22664df29825f1d40742b3964e481 Mon Sep 17 00:00:00 2001 From: Gowtham Tammana Date: Mon, 13 Feb 2017 15:01:17 -0600 Subject: km: Update gup API to k4.9 get_user_pages() API has changed since 4.6 After commit cde70140fed8 ("mm/gup: Overload get_user_pages() functions") in k4.6-rc1 use of current/current-mm as first two arguments deprecated and are inferred for the current task struct. If called for another task, get_user_pages_remote() should be used. After commit 768ae309a976 ("mm: replace get_user_pages() write/force parameters with gup_flags") in k4.9-rc2 `read` and `write` flags are replaced with `gup_flags`. Signed-off-by: Gowtham Tammana --- src/hal/os/linux/kernel/gc_hal_kernel_os.c | 7 ++----- src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/hal/os/linux/kernel/gc_hal_kernel_os.c b/src/hal/os/linux/kernel/gc_hal_kernel_os.c index 34b50e3..0baa4ca 100755 --- a/src/hal/os/linux/kernel/gc_hal_kernel_os.c +++ b/src/hal/os/linux/kernel/gc_hal_kernel_os.c @@ -4740,12 +4740,9 @@ OnError: /* Get the user pages. */ down_read(¤t->mm->mmap_sem); - result = get_user_pages(current, - current->mm, - memory & PAGE_MASK, + result = get_user_pages(memory & PAGE_MASK, pageCount, - 1, - 0, + FOLL_WRITE, pages, gcvNULL ); diff --git a/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c b/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c index 87727fe..015e67c 100755 --- a/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c +++ b/src/hal/os/linux/kernel/platform/ti/gc_hal_kernel_platform_j6.c @@ -345,8 +345,8 @@ cache_op_on_logical(gctPOINTER logical, gctSIZE_T bytes, /* lock down user memory */ down_read(¤t->mm->mmap_sem); - numPagesMapped = get_user_pages(current, current->mm, - startAddr, pageCount, 1, 0, pages, gcvNULL); + numPagesMapped = get_user_pages( + startAddr, pageCount, FOLL_WRITE, pages, gcvNULL); if (numPagesMapped == pageCount) { for (i = 0; i < pageCount; i++) { -- cgit v1.2.3-54-g00ecf