You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From ec643be82b145a65d9c78d24eea7470b9bb6e0c4 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Mon, 3 Oct 2016 10:14:10 -0700
|
|
Subject: [PATCH] staging/vchi: Convert to current get_user_pages() arguments.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
---
|
|
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 +-
|
|
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +--
|
|
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
|
|
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
|
|
@@ -426,7 +426,7 @@ create_pagelist(char __user *buf, size_t
|
|
*need_release = 0; /* do not try and release vmalloc pages */
|
|
} else {
|
|
down_read(&task->mm->mmap_sem);
|
|
- actual_pages = get_user_pages(task, task->mm,
|
|
+ actual_pages = get_user_pages(
|
|
(unsigned long)buf & ~(PAGE_SIZE - 1),
|
|
num_pages,
|
|
(type == PAGELIST_READ) ? FOLL_WRITE : 0,
|
|
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
|
|
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
|
|
@@ -1492,8 +1492,7 @@ dump_phys_mem(void *virt_addr, uint32_t
|
|
}
|
|
|
|
down_read(¤t->mm->mmap_sem);
|
|
- rc = get_user_pages(current, /* task */
|
|
- current->mm, /* mm */
|
|
+ rc = get_user_pages(
|
|
(unsigned long)virt_addr, /* start */
|
|
num_pages, /* len */
|
|
0, /* gup_flags */
|