diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-09-23 10:06:08 -0400 | 
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-09-23 10:06:08 -0400 | 
| commit | 69604fe76e58c9d195e48b41d019b07fc27ce9d7 (patch) | |
| tree | c9d1e7cfe406a8f168c3aceaf989eea0275d3045 /drivers/android/binder_alloc.c | |
| parent | 50b2d49bafa16e6311ab2da82f5aafc5f9ada99b (diff) | |
| parent | 189e7d876e48d7c791fe1c9c01516f70f5621a9f (diff) | |
Merge tag 'kvm-s390-master-6.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
More pci fixes
Fix for a code analyser warning
Diffstat (limited to 'drivers/android/binder_alloc.c')
| -rw-r--r-- | drivers/android/binder_alloc.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 51f4e1c5cd01..9b1778c00610 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -322,7 +322,6 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,  	 */  	if (vma) {  		vm_start = vma->vm_start; -		alloc->vma_vm_mm = vma->vm_mm;  		mmap_assert_write_locked(alloc->vma_vm_mm);  	} else {  		mmap_assert_locked(alloc->vma_vm_mm); @@ -795,7 +794,6 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,  	binder_insert_free_buffer(alloc, buffer);  	alloc->free_async_space = alloc->buffer_size / 2;  	binder_alloc_set_vma(alloc, vma); -	mmgrab(alloc->vma_vm_mm);  	return 0; @@ -1091,6 +1089,8 @@ static struct shrinker binder_shrinker = {  void binder_alloc_init(struct binder_alloc *alloc)  {  	alloc->pid = current->group_leader->pid; +	alloc->vma_vm_mm = current->mm; +	mmgrab(alloc->vma_vm_mm);  	mutex_init(&alloc->mutex);  	INIT_LIST_HEAD(&alloc->buffers);  }  | 
