summaryrefslogtreecommitdiffstats
path: root/drivers/platform/goldfish
diff options
context:
space:
mode:
authorLinus Torvalds2016-04-03 01:35:05 +0200
committerLinus Torvalds2016-04-03 01:35:05 +0200
commitcb107161df3c52e58033554dcb40065964350f67 (patch)
tree6367b72665cab3d5d1e19d65665e55e216c59f87 /drivers/platform/goldfish
parentMerge tag 'configfs-for-linus-2' of git://git.infradead.org/users/hch/configfs (diff)
downloadkernel-qcow2-linux-cb107161df3c52e58033554dcb40065964350f67.tar.gz
kernel-qcow2-linux-cb107161df3c52e58033554dcb40065964350f67.tar.xz
kernel-qcow2-linux-cb107161df3c52e58033554dcb40065964350f67.zip
Convert straggling drivers to new six-argument get_user_pages()
Commit d4edcf0d5695 ("mm/gup: Switch all callers of get_user_pages() to not pass tsk/mm") switched get_user_pages() callers to the simpler model where they no longer pass in the thread and mm pointer. But since then we've merged changes to a few drivers that re-introduce use of the old interface. Let's fix them up. They continued to work fine (thanks to the truly disgusting macros introduced in commit cde70140fed8: "mm/gup: Overload get_user_pages() functions"), but cause unnecessary build noise. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
-rw-r--r--drivers/platform/goldfish/goldfish_pipe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 9973cebb4d6f..07462d79d040 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -309,8 +309,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer,
* much memory to the process.
*/
down_read(&current->mm->mmap_sem);
- ret = get_user_pages(current, current->mm, address, 1,
- !is_write, 0, &page, NULL);
+ ret = get_user_pages(address, 1, !is_write, 0, &page, NULL);
up_read(&current->mm->mmap_sem);
if (ret < 0)
break;