diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-10-15 18:23:22 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-10-15 18:23:22 +1100 |
| commit | e89d80e611a073e6598fc77bcd5df00adfaacff1 (patch) | |
| tree | e691072ce0d2b3d820480690ff2ecec9caec3116 /drivers/android/binder_alloc.c | |
| parent | a46f160cb830d8f09fcdc5bb7b957bbc140b876a (diff) | |
| parent | d3dd387f30b971362cab81ad88e50df51ba22a25 (diff) | |
| download | linux-next-e89d80e611a073e6598fc77bcd5df00adfaacff1.tar.gz | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/android/binder_alloc.c')
| -rw-r--r-- | drivers/android/binder_alloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 64fd96eada31..17368ef7dea5 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -238,6 +238,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, int ret; bool on_lru; size_t index; + vm_fault_t vmf; index = (page_addr - alloc->buffer) / PAGE_SIZE; page = &alloc->pages[index]; @@ -279,8 +280,8 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, } user_page_addr = (uintptr_t)page_addr + alloc->user_buffer_offset; - ret = vm_insert_page(vma, user_page_addr, page[0].page_ptr); - if (ret) { + vmf = vmf_insert_page(vma, user_page_addr, page[0].page_ptr); + if (vmf != VM_FAULT_NOPAGE) { pr_err("%d: binder_alloc_buf failed to map page at %lx in userspace\n", alloc->pid, user_page_addr); goto err_vm_insert_page_failed; |