nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

Convert straggling drivers to new six-argument get_user_pages()

Browse source 
Commit d4edcf0d56 ("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 cde70140fe: "mm/gup: Overload get_user_pages()
functions"), but cause unnecessary build noise.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2016-04-02 18:35:05 -05:00
parent 264800b5ec
commit cb107161df
2 changed files with 2 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/platform/goldfish/goldfish_pipe.c
View file

@ -309,8 +309,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer,
* much memory to the process. * much memory to the process.
*/ */
down_read(&current->mm->mmap_sem); down_read(&current->mm->mmap_sem);
ret = get_user_pages(current, current->mm, address, 1, ret = get_user_pages(address, 1, !is_write, 0, &page, NULL);
!is_write, 0, &page, NULL);
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
if (ret < 0) if (ret < 0)
break; break;

2
drivers/rapidio/devices/rio_mport_cdev.c
View file

@ -886,7 +886,7 @@ rio_dma_transfer(struct file *filp, uint32_t transfer_mode,
} }
down_read(&current->mm->mmap_sem); down_read(&current->mm->mmap_sem);
pinned = get_user_pages(current, current->mm, pinned = get_user_pages(
(unsigned long)xfer->loc_addr & PAGE_MASK, (unsigned long)xfer->loc_addr & PAGE_MASK,
nr_pages, dir == DMA_FROM_DEVICE, 0, nr_pages, dir == DMA_FROM_DEVICE, 0,
page_list, NULL); page_list, NULL);