diff options
| author | Chris Zankel <[email protected]> | 2015-04-14 03:51:35 +0000 | 
|---|---|---|
| committer | Chris Zankel <[email protected]> | 2015-04-14 03:51:35 +0000 | 
| commit | 7ead5b7e4a3cf4a16579a8f164022345b93fe972 (patch) | |
| tree | 0a9b9497f53d1593c9e2ac197b2e686ea74a9975 /mm/process_vm_access.c | |
| parent | 834a316eeebcb75316c0a7d9088fa638c52dc584 (diff) | |
| parent | 39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff) | |
Merge tag 'v4.0' into for_next
Linux 4.0
Diffstat (limited to 'mm/process_vm_access.c')
| -rw-r--r-- | mm/process_vm_access.c | 7 | 
1 files changed, 2 insertions, 5 deletions
| diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c index 5077afcd9e11..b1597690530c 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c @@ -99,11 +99,8 @@ static int process_vm_rw_single_vec(unsigned long addr,  		size_t bytes;  		/* Get the pages we're interested in */ -		down_read(&mm->mmap_sem); -		pages = get_user_pages(task, mm, pa, pages, -				      vm_write, 0, process_pages, NULL); -		up_read(&mm->mmap_sem); - +		pages = get_user_pages_unlocked(task, mm, pa, pages, +						vm_write, 0, process_pages);  		if (pages <= 0)  			return -EFAULT; |