forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

FROMGIT: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings

Browse source 
Add BR_FROZEN_REPLY in binder_return_strings to support stat function.

Fixes: ae28c1be1e ("binder: BINDER_GET_FROZEN_INFO ioctl")
Acked-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Hang Lu <hangl@codeaurora.org>
Link: https://lore.kernel.org/r/1617961246-4502-2-git-send-email-hangl@codeaurora.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 0051691574
git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc-next)

Change-Id: Ib12e3f1dc1a389c9b4d5e9f60bd740d269dadf94
Signed-off-by: Hang Lu <hangl@codeaurora.org>
This commit is contained in:
Hang Lu 2021-04-09 17:40:45 +08:00 • committed by Todd Kjos
commit 6c3c18a4c9
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/android/binder.c
View file

@ -5695,7 +5695,8 @@ static const char * const binder_return_strings[] = {
"BR_FINISHED",
"BR_DEAD_BINDER",
"BR_CLEAR_DEATH_NOTIFICATION_DONE",
"BR_FAILED_REPLY"
"BR_FAILED_REPLY",
"BR_FROZEN_REPLY",
};
static const char * const binder_command_strings[] = {

2
drivers/android/binder_internal.h
View file

@ -155,7 +155,7 @@ enum binder_stat_types {
};
struct binder_stats {
atomic_t br[_IOC_NR(BR_FAILED_REPLY) + 1];
atomic_t br[_IOC_NR(BR_FROZEN_REPLY) + 1];
atomic_t bc[_IOC_NR(BC_REPLY_SG) + 1];
atomic_t obj_created[BINDER_STAT_COUNT];
atomic_t obj_deleted[BINDER_STAT_COUNT];