diff options
| author | Greg Kroah-Hartman <[email protected]> | 2021-09-27 16:45:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2021-09-27 16:45:36 +0200 |
| commit | 9b40e16ee51a0e9255cd2571c76b1c8a0b504c74 (patch) | |
| tree | fc2226242e187d1827398bd527b9a795e3458ff9 /include/uapi/linux/android | |
| parent | c34e73d67c82a9f13c45627e7ba7e0006c26abb7 (diff) | |
| parent | 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 (diff) | |
Merge branch 5.15-rc3 into staging-next
We need the fixes in here, and it resolves a merge issue with
drivers/staging/r8188eu/os_dep/ioctl_linux.c
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'include/uapi/linux/android')
| -rw-r--r-- | include/uapi/linux/android/binder.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h index 20e435fe657a..3246f2c74696 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -225,7 +225,14 @@ struct binder_freeze_info { struct binder_frozen_status_info { __u32 pid; + + /* process received sync transactions since last frozen + * bit 0: received sync transaction after being frozen + * bit 1: new pending sync transaction during freezing + */ __u32 sync_recv; + + /* process received async transactions since last frozen */ __u32 async_recv; }; |