mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge branch 'android11-5.4' into 'android11-5.4-lts'
Sync up with android11-5.4 for the following commits:b0f930a58eBACKPORT: f2fs: relocate inline conversion from mmap() to mkwrite()4f4602b711BACKPORT: f2fs: support RO featuree6fd4c5c6aBACKPORT: f2fs: fix wrong total_sections check and fsmeta checkce664fbdccBACKPORT: FROMGIT: binder: fix freeze raceb1232b020fFROMGIT: binder: BINDER_GET_FROZEN_INFO ioctla02d0f685dFROMGIT: binder: use EINTR for interrupted wait for worke658e9e4bcBACKPORT: FROMGIT: binder: BINDER_FREEZE ioctl63ef444773ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request50c9c8cb33FROMGIT: binder: fix test regression due to sender_euid change1c1f571840BACKPORT: binder: use cred instead of task for getsecidea1a2391d5BACKPORT: binder: use cred instead of task for selinux checks1fe8a2bb64BACKPORT: binder: use euid from cred instead of using taska080050156ANDROID: setlocalversion: make KMI_GENERATION optionale785a25f52Revert "ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC" Change-Id: Ica7d80e62dcd4b12f7294bcc4b5c9291491ad37b Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
commit
b2d37d0916
17 changed files with 419 additions and 99 deletions
|
|
@ -265,6 +265,25 @@ struct binder_node_info_for_ref {
|
|||
__u32 reserved3;
|
||||
};
|
||||
|
||||
struct binder_freeze_info {
|
||||
__u32 pid;
|
||||
__u32 enable;
|
||||
__u32 timeout_ms;
|
||||
};
|
||||
|
||||
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;
|
||||
};
|
||||
|
||||
#define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read)
|
||||
#define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64)
|
||||
#define BINDER_SET_MAX_THREADS _IOW('b', 5, __u32)
|
||||
|
|
@ -275,6 +294,8 @@ struct binder_node_info_for_ref {
|
|||
#define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info)
|
||||
#define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref)
|
||||
#define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object)
|
||||
#define BINDER_FREEZE _IOW('b', 14, struct binder_freeze_info)
|
||||
#define BINDER_GET_FROZEN_INFO _IOWR('b', 15, struct binder_frozen_status_info)
|
||||
|
||||
/*
|
||||
* NOTE: Two special error codes you should check for when calling
|
||||
|
|
@ -456,6 +477,12 @@ enum binder_driver_return_protocol {
|
|||
* The the last transaction (either a bcTRANSACTION or
|
||||
* a bcATTEMPT_ACQUIRE) failed (e.g. out of memory). No parameters.
|
||||
*/
|
||||
|
||||
BR_FROZEN_REPLY = _IO('r', 18),
|
||||
/*
|
||||
* The target of the last transaction (either a bcTRANSACTION or
|
||||
* a bcATTEMPT_ACQUIRE) is frozen. No parameters.
|
||||
*/
|
||||
};
|
||||
|
||||
enum binder_driver_command_protocol {
|
||||
|
|
|
|||
Loading…
Reference in a new issue