summaryrefslogtreecommitdiff
path: root/drivers/android
diff options
context:
space:
mode:
authorHang Lu <hangl@codeaurora.org>2021-04-09 17:40:45 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-10 10:52:04 +0200
commit005169157448ca41eff8716d79dc1b8f158229d2 (patch)
tree6da157c613106d8aa3383c0b90705aac0fb6b25f /drivers/android
parentb195b20b7145bcae22ad261abc52d68336f5e913 (diff)
downloadlinux-rpi-005169157448ca41eff8716d79dc1b8f158229d2.tar.gz
linux-rpi-005169157448ca41eff8716d79dc1b8f158229d2.tar.bz2
linux-rpi-005169157448ca41eff8716d79dc1b8f158229d2.zip
binder: fix the missing BR_FROZEN_REPLY in binder_return_strings
Add BR_FROZEN_REPLY in binder_return_strings to support stat function. Fixes: ae28c1be1e54 ("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>
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/binder.c3
-rw-r--r--drivers/android/binder_internal.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index e1a484ab0366..be34da3dd077 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -5559,7 +5559,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[] = {
diff --git a/drivers/android/binder_internal.h b/drivers/android/binder_internal.h
index 2872a7de68e1..a50716696fad 100644
--- a/drivers/android/binder_internal.h
+++ b/drivers/android/binder_internal.h
@@ -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];