diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 05df1e0ec177..860642bcf517 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -5627,6 +5627,7 @@
       <elf-symbol name='woken_wake_function' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd0654aba'/>
       <elf-symbol name='work_busy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x86ab091d'/>
       <elf-symbol name='work_on_cpu' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf82f3657'/>
+      <elf-symbol name='wq_worker_comm' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbf7d8211'/>
       <elf-symbol name='ww_mutex_lock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc3dce33a'/>
       <elf-symbol name='ww_mutex_lock_interruptible' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8d55f432'/>
       <elf-symbol name='ww_mutex_unlock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb55e131a'/>
@@ -6910,7 +6911,6 @@
         </data-member>
       </class-decl>
       <qualified-type-def type-id='49f5fd4d' const='yes' id='02793b54'/>
-      <pointer-type-def type-id='40ffc582' size-in-bits='64' id='027ab274'/>
       <function-type size-in-bits='64' id='0286989c'>
         <parameter type-id='328dda6e'/>
         <parameter type-id='0fbf3cfd'/>
@@ -23295,7 +23295,7 @@
       <pointer-type-def type-id='6cf6468f' size-in-bits='64' id='2cb135bf'/>
       <pointer-type-def type-id='051f9336' size-in-bits='64' id='2cb49514'/>
       <pointer-type-def type-id='cfb839d2' size-in-bits='64' id='2cbd236c'/>
-      <pointer-type-def type-id='83c3a084' size-in-bits='64' id='2cbe71cf'/>
+      <pointer-type-def type-id='83c3a083' size-in-bits='64' id='2cbe71ce'/>
       <pointer-type-def type-id='455e2261' size-in-bits='64' id='2cc5a575'/>
       <array-type-def dimensions='1' type-id='a7832498' size-in-bits='160' id='2ccab0ee'>
         <subrange length='5' type-id='7ff19f0f' id='53010e10'/>
@@ -24518,7 +24518,6 @@
       </function-type>
       <pointer-type-def type-id='391881a9' size-in-bits='64' id='302e9391'/>
       <pointer-type-def type-id='845f3205' size-in-bits='64' id='30341fa1'/>
-      <pointer-type-def type-id='4f5f116f' size-in-bits='64' id='30351b23'/>
       <pointer-type-def type-id='4657336c' size-in-bits='64' id='303e01fa'/>
       <class-decl name='scmi_notify_ops' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/scmi_protocol.h' line='597' column='1' id='3042e3e4'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -30890,9 +30889,6 @@
         </data-member>
       </class-decl>
       <qualified-type-def type-id='6d84fe29' const='yes' id='40fcf9ec'/>
-      <function-type size-in-bits='64' id='40ffc582'>
-        <return type-id='3a47d82b'/>
-      </function-type>
       <pointer-type-def type-id='f1bdbe5e' size-in-bits='64' id='4110d6d4'/>
       <function-type size-in-bits='64' id='4111263b'>
         <parameter type-id='abd62a96'/>
@@ -33574,7 +33570,7 @@
       <pointer-type-def type-id='f4c2725e' size-in-bits='64' id='498944b4'/>
       <pointer-type-def type-id='0e15337c' size-in-bits='64' id='498f47da'/>
       <function-type size-in-bits='64' id='4993d1b5'>
-        <parameter type-id='4dfe71de' name='c'/>
+        <parameter type-id='4dfe71de'/>
         <return type-id='91ce1af9'/>
       </function-type>
       <pointer-type-def type-id='bfa69bfb' size-in-bits='64' id='4998c99f'/>
@@ -35816,10 +35812,6 @@
           <var-decl name='ContainerID' type-id='9396cabb' visibility='default' filepath='include/uapi/linux/usb/ch9.h' line='945' column='1'/>
         </data-member>
       </class-decl>
-      <function-type size-in-bits='64' id='4f5f116f'>
-        <parameter type-id='4dfe71de'/>
-        <return type-id='3a47d82b'/>
-      </function-type>
       <class-decl name='gendisk' size-in-bits='10496' is-struct='yes' visibility='default' filepath='include/linux/genhd.h' line='176' column='1' id='4f60ffbc'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='major' type-id='95e97e5e' visibility='default' filepath='include/linux/genhd.h' line='180' column='1'/>
@@ -57843,7 +57835,7 @@
           <var-decl name='envelope' type-id='95dfde06' visibility='default' filepath='include/uapi/linux/input.h' line='359' column='1'/>
         </data-member>
       </class-decl>
-      <union-decl name='tcp_cc_info' visibility='default' is-declaration-only='yes' id='83c3a084'/>
+      <union-decl name='tcp_cc_info' visibility='default' is-declaration-only='yes' id='83c3a083'/>
       <function-type size-in-bits='64' id='83c3d80a'>
         <parameter type-id='5dbfcbb1'/>
         <parameter type-id='f9b06939'/>
@@ -64906,6 +64898,9 @@
         <parameter type-id='78c01427'/>
         <return type-id='95e97e5e'/>
       </function-type>
+      <array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='2048' id='93e41790'>
+        <subrange length='64' type-id='7ff19f0f' id='b10be967'/>
+      </array-type-def>
       <pointer-type-def type-id='42b001af' size-in-bits='64' id='93edac17'/>
       <array-type-def dimensions='1' type-id='3b0abfc6' size-in-bits='768' id='93f82aba'>
         <subrange length='6' type-id='7ff19f0f' id='52fa524b'/>
@@ -73814,12 +73809,12 @@
         </data-member>
       </class-decl>
       <qualified-type-def type-id='4e0399c2' const='yes' id='a87d8ed1'/>
-      <class-decl name='wq_device' size-in-bits='7232' is-struct='yes' visibility='default' filepath='kernel/workqueue.c' line='5393' column='1' id='a88ecfc8'>
+      <class-decl name='wq_device' size-in-bits='7232' is-struct='yes' visibility='default' filepath='kernel/workqueue.c' line='5394' column='1' id='a88ecfc8'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='wq' type-id='242e3d19' visibility='default' filepath='kernel/workqueue.c' line='5394' column='1'/>
+          <var-decl name='wq' type-id='242e3d19' visibility='default' filepath='kernel/workqueue.c' line='5395' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='kernel/workqueue.c' line='5395' column='1'/>
+          <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='kernel/workqueue.c' line='5396' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='_ddebug' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/dynamic_debug.h' line='14' column='1' id='a88f76f1'>
@@ -75249,7 +75244,11 @@
       <pointer-type-def type-id='512ac7cc' size-in-bits='64' id='ac58af12'/>
       <pointer-type-def type-id='b254b8db' size-in-bits='64' id='ac5f2363'/>
       <pointer-type-def type-id='49a0ad34' size-in-bits='64' id='ac6963b2'/>
-      <class-decl name='prot_inuse' is-struct='yes' visibility='default' is-declaration-only='yes' id='ac763c5d'/>
+      <class-decl name='prot_inuse' size-in-bits='2048' is-struct='yes' visibility='default' filepath='net/core/sock.c' line='3311' column='1' id='ac763c5d'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='val' type-id='93e41790' visibility='default' filepath='net/core/sock.c' line='3312' column='1'/>
+        </data-member>
+      </class-decl>
       <function-type size-in-bits='64' id='ac765b39'>
         <parameter type-id='2ba25712'/>
         <parameter type-id='14bde5bf'/>
@@ -112212,7 +112211,7 @@
         <parameter type-id='f772df6d'/>
         <parameter type-id='19c2251e'/>
         <parameter type-id='7292109c'/>
-        <parameter type-id='2cbe71cf'/>
+        <parameter type-id='2cbe71ce'/>
         <return type-id='b59d7dce'/>
       </function-type>
       <pointer-type-def type-id='d71978c5' size-in-bits='64' id='fe17c379'/>
@@ -119545,13 +119544,13 @@
         <parameter type-id='19c2251e' name='maxsec' filepath='kernel/time/clocksource.c' line='45' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='clocksource_mmio_init' mangled-name='clocksource_mmio_init' filepath='include/linux/clocksource.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clocksource_mmio_init'>
-        <parameter type-id='eaa32e2f'/>
-        <parameter type-id='80f4b756'/>
-        <parameter type-id='7359adad'/>
-        <parameter type-id='95e97e5e'/>
-        <parameter type-id='f0981eeb'/>
-        <parameter type-id='30351b23'/>
+      <function-decl name='clocksource_mmio_init' mangled-name='clocksource_mmio_init' filepath='drivers/clocksource/mmio.c' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clocksource_mmio_init'>
+        <parameter type-id='eaa32e2f' name='base' filepath='drivers/clocksource/mmio.c' line='50' column='1'/>
+        <parameter type-id='80f4b756' name='name' filepath='drivers/clocksource/mmio.c' line='50' column='1'/>
+        <parameter type-id='7359adad' name='hz' filepath='drivers/clocksource/mmio.c' line='51' column='1'/>
+        <parameter type-id='95e97e5e' name='rating' filepath='drivers/clocksource/mmio.c' line='51' column='1'/>
+        <parameter type-id='f0981eeb' name='bits' filepath='drivers/clocksource/mmio.c' line='51' column='1'/>
+        <parameter type-id='34fd0229' name='read' filepath='drivers/clocksource/mmio.c' line='52' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
       <function-decl name='clocksource_mmio_readl_up' mangled-name='clocksource_mmio_readl_up' filepath='drivers/clocksource/mmio.c' line='20' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clocksource_mmio_readl_up'>
@@ -135892,10 +135891,10 @@
       <function-decl name='sched_clock' mangled-name='sched_clock' filepath='kernel/time/sched_clock.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_clock'>
         <return type-id='3a47d82b'/>
       </function-decl>
-      <function-decl name='sched_clock_register' mangled-name='sched_clock_register' filepath='include/linux/sched_clock.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_clock_register'>
-        <parameter type-id='027ab274'/>
-        <parameter type-id='95e97e5e'/>
-        <parameter type-id='7359adad'/>
+      <function-decl name='sched_clock_register' mangled-name='sched_clock_register' filepath='kernel/time/sched_clock.c' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_clock_register'>
+        <parameter type-id='0e70db3e' name='read' filepath='kernel/time/sched_clock.c' line='153' column='1'/>
+        <parameter type-id='95e97e5e' name='bits' filepath='kernel/time/sched_clock.c' line='153' column='1'/>
+        <parameter type-id='7359adad' name='rate' filepath='kernel/time/sched_clock.c' line='153' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <var-decl name='sched_feat_keys' type-id='9cc39ce1' mangled-name='sched_feat_keys' visibility='default' filepath='kernel/sched/debug.c' line='80' column='1' elf-symbol-id='sched_feat_keys'/>
@@ -143140,12 +143139,18 @@
         <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='4593' column='1'/>
         <return type-id='f0981eeb'/>
       </function-decl>
-      <function-decl name='work_on_cpu' mangled-name='work_on_cpu' filepath='kernel/workqueue.c' line='5149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='work_on_cpu'>
-        <parameter type-id='95e97e5e' name='cpu' filepath='kernel/workqueue.c' line='5149' column='1'/>
-        <parameter type-id='68883d61' name='fn' filepath='kernel/workqueue.c' line='5149' column='1'/>
-        <parameter type-id='eaa32e2f' name='arg' filepath='kernel/workqueue.c' line='5149' column='1'/>
+      <function-decl name='work_on_cpu' mangled-name='work_on_cpu' filepath='kernel/workqueue.c' line='5150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='work_on_cpu'>
+        <parameter type-id='95e97e5e' name='cpu' filepath='kernel/workqueue.c' line='5150' column='1'/>
+        <parameter type-id='68883d61' name='fn' filepath='kernel/workqueue.c' line='5150' column='1'/>
+        <parameter type-id='eaa32e2f' name='arg' filepath='kernel/workqueue.c' line='5150' column='1'/>
         <return type-id='bd54fe1a'/>
       </function-decl>
+      <function-decl name='wq_worker_comm' mangled-name='wq_worker_comm' filepath='kernel/workqueue.c' line='4864' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wq_worker_comm'>
+        <parameter type-id='26a90f95' name='buf' filepath='kernel/workqueue.c' line='4864' column='1'/>
+        <parameter type-id='b59d7dce' name='size' filepath='kernel/workqueue.c' line='4864' column='1'/>
+        <parameter type-id='f23e2572' name='task' filepath='kernel/workqueue.c' line='4864' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='ww_mutex_lock' mangled-name='ww_mutex_lock' filepath='kernel/locking/mutex.c' line='1443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ww_mutex_lock'>
         <parameter type-id='7533ba6f' name='lock' filepath='kernel/locking/mutex.c' line='1443' column='1'/>
         <parameter type-id='c1d02a64' name='ctx' filepath='kernel/locking/mutex.c' line='1443' column='1'/>
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index d1b0509ddd52..ed7628dfcd28 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -3327,6 +3327,7 @@
   woken_wake_function
   work_busy
   work_on_cpu
+  wq_worker_comm
   ww_mutex_lock
   ww_mutex_unlock
   __xa_alloc