diff options
| author | Tejun Heo <tj@kernel.org> | 2016-05-09 12:34:39 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-05-09 12:34:39 -0400 |
| commit | 698f6700a6f19ba4550a722eaacf9f9d212b3fd9 (patch) | |
| tree | ff63c9a23fe47870df8788ff5e7d9a552f6d4ed1 /mm/nommu.c | |
| parent | 7780081c1f04a4ea31331b5579ca010cc1f26c74 (diff) | |
| parent | 13f307711b127d30fcf333a04365a217baf9ca2b (diff) | |
| download | linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.tar.gz linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.tar.bz2 linux-698f6700a6f19ba4550a722eaacf9f9d212b3fd9.zip | |
Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac
Pulling in the dependencies for further ZAC changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index de8b6b6580c1..102e257cc6c3 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -141,7 +141,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, if (pages) { pages[i] = virt_to_page(start); if (pages[i]) - page_cache_get(pages[i]); + get_page(pages[i]); } if (vmas) vmas[i] = vma; |