mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge android11-5.4.161+ (5d7a491) into msm-5.4
* refs/heads/tmp-5d7a491: UPSTREAM: lib/iov_iter: initialize "flags" in new pipe_buffer Revert "ANDROID: incremental-fs: remove index and incomplete dir on umount" Revert "ANDROID: incremental-fs: fix mount_fs issue" FROMGIT: f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file UPSTREAM: usb: gadget: rndis: check size of RNDIS_MSG_SET command UPSTREAM: USB: gadget: validate interface OS descriptor requests Revert "tracefs: Have tracefs directories not set OTH permission bits by default" UPSTREAM: tipc: improve size validations for received domain records ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0 ANDROID: GKI: db845c: Update symbols list and ABI ANDROID: Increase x86 cmdline size to 4k UPSTREAM: cgroup-v1: Require capabilities to set release_agent ANDROID: incremental-fs: remove index and incomplete dir on umount UPSTREAM: binder: fix async_free_space accounting for empty parcels UPSTREAM: tee: handle lookup of shm with reference count 0 UPSTREAM: bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc Change-Id: Icb1c0295b7d7da25c37c21a2580ea4d246069039 Signed-off-by: Srinivasarao Pathipati <[email protected]>
This commit is contained in:
commit
c256d34783
21 changed files with 2010 additions and 2010 deletions
|
|
@ -662,7 +662,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
|
|||
BUG_ON(buffer->user_data > alloc->buffer + alloc->buffer_size);
|
||||
|
||||
if (buffer->async_transaction) {
|
||||
alloc->free_async_space += size + sizeof(struct binder_buffer);
|
||||
alloc->free_async_space += buffer_size + sizeof(struct binder_buffer);
|
||||
|
||||
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
|
||||
"%d: binder_free_buf size %zd async free %zd\n",
|
||||
|
|
|
|||
Loading…
Reference in a new issue