diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-09-10 16:39:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-10 16:39:51 +0100 |
| commit | 824723ccf53fc53ecf896753c562b00a5d6307eb (patch) | |
| tree | c0ec150c4510eb161ba57a7fd39a1393f3b77cdd /drivers/android/binder_alloc.c | |
| parent | spi: Group cs_change and cs_off flags together in struct spi_transfer (diff) | |
| parent | Linux 6.0-rc4 (diff) | |
| download | linux-dev-824723ccf53fc53ecf896753c562b00a5d6307eb.tar.xz linux-dev-824723ccf53fc53ecf896753c562b00a5d6307eb.zip | |
spi: Merge tag 'v6.0-rc4' into spi-6.1
Linux 6.0-rc4 so we can test on BeagleBone again.
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); } |