From f56163ffebdec3e770bfc700a9e3948d23cf98cd Mon Sep 17 00:00:00 2001 From: Li Huang Date: Thu, 31 Oct 2019 16:05:00 +0800 Subject: [PATCH] video/rockchip: rga: fix compile error on 4.19 Change-Id: I1ad9c87a7401788a691cae6844807aaca5348cfc Signed-off-by: Li Huang --- drivers/video/rockchip/rga/rga_mmu_info.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c index 966b7d1d0864..a8d7e6263cda 100644 --- a/drivers/video/rockchip/rga/rga_mmu_info.c +++ b/drivers/video/rockchip/rga/rga_mmu_info.c @@ -329,15 +329,14 @@ static int rga_MapUserMemory(struct page **pages, do { down_read(¤t->mm->mmap_sem); - result = get_user_pages(current, - current->mm, - Memory << PAGE_SHIFT, - pageCount, - 1, - 0, - pages, - NULL - ); +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) + result = get_user_pages(current, current->mm, + Memory << PAGE_SHIFT, pageCount, 1, 0, + pages, NULL); +#else + result = get_user_pages_remote(current, current->mm, + Memory << PAGE_SHIFT, pageCount, 1, pages, NULL, NULL); +#endif up_read(¤t->mm->mmap_sem); #if 0