diff --git a/gki/aarch64/abi.stg b/gki/aarch64/abi.stg
index 0f45f7c84353..8559c5e92c5e 100644
--- a/gki/aarch64/abi.stg
+++ b/gki/aarch64/abi.stg
@@ -14978,6 +14978,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x54a91269
 }
+pointer_reference {
+  id: 0x1fbeff3e
+  kind: POINTER
+  pointee_type_id: 0x54bb1a65
+}
 pointer_reference {
   id: 0x1fc1dca8
   kind: POINTER
@@ -378713,6 +378718,11 @@ function {
   return_type_id: 0x48b5725f
   parameter_id: 0x1fba7d3d
 }
+function {
+  id: 0x1777ee5c
+  return_type_id: 0x48b5725f
+  parameter_id: 0x1fbeff3e
+}
 function {
   id: 0x177c5cdf
   return_type_id: 0x48b5725f
@@ -410771,6 +410781,14 @@ function {
   parameter_id: 0x18150d9f
   parameter_id: 0x06b96242
 }
+function {
+  id: 0x9ba060b9
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x00be4281
+  parameter_id: 0x3593bec8
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9ba0658b
   return_type_id: 0x6720d32f
@@ -425735,6 +425753,11 @@ function {
   parameter_id: 0x18019702
   parameter_id: 0x6720d32f
 }
+function {
+  id: 0xf94be4cb
+  return_type_id: 0x6d7f5ff6
+  parameter_id: 0x1fbeff3e
+}
 function {
   id: 0xf9525760
   return_type_id: 0x6d7f5ff6
@@ -434529,6 +434552,15 @@ elf_symbol {
   type_id: 0x9ba93092
   full_name: "__traceiter_android_vh_rwsem_can_spin_on_owner"
 }
+elf_symbol {
+  id: 0xaa42999f
+  name: "__traceiter_android_vh_rwsem_direct_rsteal"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x991a987a
+  type_id: 0x9ba93092
+  full_name: "__traceiter_android_vh_rwsem_direct_rsteal"
+}
 elf_symbol {
   id: 0xbef2021a
   name: "__traceiter_android_vh_rwsem_downgrade_wake_finish"
@@ -434565,6 +434597,15 @@ elf_symbol {
   type_id: 0x9ba966ad
   full_name: "__traceiter_android_vh_rwsem_opt_spin_start"
 }
+elf_symbol {
+  id: 0x66c7c5f3
+  name: "__traceiter_android_vh_rwsem_optimistic_rspin"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0f9432e7
+  type_id: 0x9ba060b9
+  full_name: "__traceiter_android_vh_rwsem_optimistic_rspin"
+}
 elf_symbol {
   id: 0xc710ea63
   name: "__traceiter_android_vh_rwsem_read_trylock_failed"
@@ -440811,6 +440852,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rwsem_can_spin_on_owner"
 }
+elf_symbol {
+  id: 0x403cf0dd
+  name: "__tracepoint_android_vh_rwsem_direct_rsteal"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7c5aa8a7
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_direct_rsteal"
+}
 elf_symbol {
   id: 0x74f587f0
   name: "__tracepoint_android_vh_rwsem_downgrade_wake_finish"
@@ -440847,6 +440897,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rwsem_opt_spin_start"
 }
+elf_symbol {
+  id: 0x8866a3b9
+  name: "__tracepoint_android_vh_rwsem_optimistic_rspin"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7c5aa8a7
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_optimistic_rspin"
+}
 elf_symbol {
   id: 0xf58571d5
   name: "__tracepoint_android_vh_rwsem_read_trylock_failed"
@@ -479976,6 +480035,24 @@ elf_symbol {
   type_id: 0x10985193
   full_name: "orderly_reboot"
 }
+elf_symbol {
+  id: 0x33abdf76
+  name: "osq_lock"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5c4c07ba
+  type_id: 0xf94be4cb
+  full_name: "osq_lock"
+}
+elf_symbol {
+  id: 0x2ffaca4e
+  name: "osq_unlock"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xaa9b9f7d
+  type_id: 0x1777ee5c
+  full_name: "osq_unlock"
+}
 elf_symbol {
   id: 0x57ecab02
   name: "out_of_line_wait_on_bit"
@@ -509764,10 +509841,12 @@ interface {
   symbol_id: 0x91384eff
   symbol_id: 0xfb1b8d64
   symbol_id: 0x5858f827
+  symbol_id: 0xaa42999f
   symbol_id: 0xbef2021a
   symbol_id: 0xb1847a6f
   symbol_id: 0x958d8cdb
   symbol_id: 0xfde8086a
+  symbol_id: 0x66c7c5f3
   symbol_id: 0xc710ea63
   symbol_id: 0xbffefc2b
   symbol_id: 0x3d83999a
@@ -510462,10 +510541,12 @@ interface {
   symbol_id: 0x3fc5ffc9
   symbol_id: 0xf01f02ea
   symbol_id: 0xe471b8d5
+  symbol_id: 0x403cf0dd
   symbol_id: 0x74f587f0
   symbol_id: 0x84628825
   symbol_id: 0x8d0ce77d
   symbol_id: 0x50ab483c
+  symbol_id: 0x8866a3b9
   symbol_id: 0xf58571d5
   symbol_id: 0xe7ef7059
   symbol_id: 0xf2d006c8
@@ -514810,6 +514891,8 @@ interface {
   symbol_id: 0x224cb6b2
   symbol_id: 0x67bce5b1
   symbol_id: 0xfbd23728
+  symbol_id: 0x33abdf76
+  symbol_id: 0x2ffaca4e
   symbol_id: 0x57ecab02
   symbol_id: 0xc31e86d2
   symbol_id: 0x27d0c7b6
diff --git a/gki/aarch64/symbols/xiaomi b/gki/aarch64/symbols/xiaomi
index 2f4204f9e64b..1f8a2b2e3d86 100644
--- a/gki/aarch64/symbols/xiaomi
+++ b/gki/aarch64/symbols/xiaomi
@@ -121,6 +121,9 @@
   __traceiter_android_vh_mutex_wait_start
   __traceiter_android_vh_alter_mutex_list_add
   __traceiter_android_rvh_cpuset_fork
+  __traceiter_android_vh_mutex_init
+  __traceiter_android_vh_rwsem_direct_rsteal
+  __traceiter_android_vh_rwsem_optimistic_rspin
   __traceiter_android_vh_sched_setaffinity_early
   __traceiter_android_rvh_set_cpus_allowed_comm
   __traceiter_android_rvh_dequeue_task
@@ -129,12 +132,17 @@
   __tracepoint_android_vh_mutex_wait_start
   __tracepoint_android_vh_alter_mutex_list_add
   __tracepoint_android_rvh_cpuset_fork
+  __tracepoint_android_vh_mutex_init
+  __tracepoint_android_vh_rwsem_direct_rsteal
+  __tracepoint_android_vh_rwsem_optimistic_rspin
   __tracepoint_android_vh_sched_setaffinity_early
   __tracepoint_android_rvh_set_cpus_allowed_comm
   __tracepoint_android_rvh_dequeue_task
   cpuset_cpus_allowed
   cpufreq_update_policy
   cgroup_threadgroup_rwsem
+  osq_lock
+  osq_unlock
 
 #required by millet.ko
   __traceiter_android_rvh_refrigerator