diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 00dd7dfc4a86..f68528f3205c 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -5183,6 +5183,8 @@
       <elf-symbol name='usb_composite_setup_continue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x905376a5'/>
       <elf-symbol name='usb_composite_unregister' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9bc058aa'/>
       <elf-symbol name='usb_control_msg' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x75407b88'/>
+      <elf-symbol name='usb_control_msg_recv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xba9c8ca3'/>
+      <elf-symbol name='usb_control_msg_send' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf38dd350'/>
       <elf-symbol name='usb_copy_descriptors' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2e09263f'/>
       <elf-symbol name='usb_create_hcd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1d03ee18'/>
       <elf-symbol name='usb_create_shared_hcd' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2f5a19e3'/>
@@ -10532,7 +10534,7 @@
           <var-decl name='cpu_context' type-id='6a577ca5' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='137' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='uw' type-id='e7f43fde' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='148' column='1'/>
+          <var-decl name='uw' type-id='e7f43fdd' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='148' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5248'>
           <var-decl name='android_vendor_data1' type-id='91ce1af9' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='150' column='1'/>
@@ -25277,7 +25279,7 @@
       </array-type-def>
       <class-decl name='mm_struct' size-in-bits='7808' is-struct='yes' visibility='default' filepath='include/linux/mm_types.h' line='435' column='1' id='311626f1'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='' type-id='e7f43fcf' visibility='default' filepath='include/linux/mm_types.h' line='436' column='1'/>
+          <var-decl name='' type-id='e7f43fce' visibility='default' filepath='include/linux/mm_types.h' line='436' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='7808'>
           <var-decl name='cpu_bitmap' type-id='c99b5ecd' visibility='default' filepath='include/linux/mm_types.h' line='647' column='1'/>
@@ -27993,7 +27995,7 @@
       <pointer-type-def type-id='175944cd' size-in-bits='64' id='38ed603d'/>
       <class-decl name='kernel_siginfo' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/signal_types.h' line='12' column='1' id='38ef7882'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='' type-id='e7f43fe6' visibility='default' filepath='include/linux/signal_types.h' line='13' column='1'/>
+          <var-decl name='' type-id='e7f43fe5' visibility='default' filepath='include/linux/signal_types.h' line='13' column='1'/>
         </data-member>
       </class-decl>
       <function-type size-in-bits='64' id='38f02a1a'>
@@ -35676,10 +35678,10 @@
           <var-decl name='winsize' type-id='a818b7a0' visibility='default' filepath='include/linux/tty.h' line='166' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='3584'>
-          <var-decl name='flow' type-id='e7f43fdc' visibility='default' filepath='include/linux/tty.h' line='173' column='1'/>
+          <var-decl name='flow' type-id='e7f43fdb' visibility='default' filepath='include/linux/tty.h' line='173' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='3648'>
-          <var-decl name='ctrl' type-id='e7f43fdd' visibility='default' filepath='include/linux/tty.h' line='182' column='1'/>
+          <var-decl name='ctrl' type-id='e7f43fdc' visibility='default' filepath='include/linux/tty.h' line='182' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='3904'>
           <var-decl name='hw_stopped' type-id='95e97e5e' visibility='default' filepath='include/linux/tty.h' line='184' column='1'/>
@@ -38862,7 +38864,7 @@
           <var-decl name='dl_nr_running' type-id='f0981eeb' visibility='default' filepath='kernel/sched/sched.h' line='688' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='earliest_dl' type-id='e7f43ff4' visibility='default' filepath='kernel/sched/sched.h' line='700' column='1'/>
+          <var-decl name='earliest_dl' type-id='e7f43ff3' visibility='default' filepath='kernel/sched/sched.h' line='700' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='dl_nr_migratory' type-id='f0981eeb' visibility='default' filepath='kernel/sched/sched.h' line='702' column='1'/>
@@ -41809,7 +41811,7 @@
           <var-decl name='ptype_specific' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1974' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1280'>
-          <var-decl name='adj_list' type-id='e7f43fda' visibility='default' filepath='include/linux/netdevice.h' line='1979' column='1'/>
+          <var-decl name='adj_list' type-id='e7f43fd9' visibility='default' filepath='include/linux/netdevice.h' line='1979' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1536'>
           <var-decl name='flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1982' column='1'/>
@@ -58827,7 +58829,7 @@
       <pointer-type-def type-id='f0981eeb' size-in-bits='64' id='807869d3'/>
       <class-decl name='vm_fault' size-in-bits='960' is-struct='yes' visibility='default' filepath='include/linux/mm.h' line='534' column='1' id='807afe73'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='' type-id='e7f43fc3' visibility='default' filepath='include/linux/mm.h' line='535' column='1'/>
+          <var-decl name='' type-id='e7f43fc2' visibility='default' filepath='include/linux/mm.h' line='535' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='flags' type-id='86db32eb' visibility='default' filepath='include/linux/mm.h' line='541' column='1'/>
@@ -73085,7 +73087,7 @@
           <var-decl name='sk_receive_queue' type-id='e61c85d0' visibility='default' filepath='include/net/sock.h' line='400' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1856'>
-          <var-decl name='sk_backlog' type-id='e7f43fdb' visibility='default' filepath='include/net/sock.h' line='414' column='1'/>
+          <var-decl name='sk_backlog' type-id='e7f43fda' visibility='default' filepath='include/net/sock.h' line='414' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2048'>
           <var-decl name='sk_forward_alloc' type-id='95e97e5e' visibility='default' filepath='include/net/sock.h' line='417' column='1'/>
@@ -73776,7 +73778,7 @@
       </class-decl>
       <union-decl name='rcu_special' size-in-bits='32' visibility='default' filepath='include/linux/sched.h' line='698' column='1' id='a324790e'>
         <data-member access='public'>
-          <var-decl name='b' type-id='e7f43fe5' visibility='default' filepath='include/linux/sched.h' line='704' column='1'/>
+          <var-decl name='b' type-id='e7f43fe4' visibility='default' filepath='include/linux/sched.h' line='704' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='s' type-id='19c2251e' visibility='default' filepath='include/linux/sched.h' line='705' column='1'/>
@@ -74808,25 +74810,25 @@
       </class-decl>
       <union-decl name='__sifields' size-in-bits='256' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='37' column='1' id='a60646cb'>
         <data-member access='public'>
-          <var-decl name='_kill' type-id='e7f43fe7' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='42' column='1'/>
+          <var-decl name='_kill' type-id='e7f43fe6' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='42' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_timer' type-id='e7f43fe8' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='50' column='1'/>
+          <var-decl name='_timer' type-id='e7f43fe7' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='50' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_rt' type-id='e7f43fe9' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='57' column='1'/>
+          <var-decl name='_rt' type-id='e7f43fe8' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='57' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_sigchld' type-id='e7f43fea' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='66' column='1'/>
+          <var-decl name='_sigchld' type-id='e7f43fe9' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='66' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_sigfault' type-id='e7f43feb' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='104' column='1'/>
+          <var-decl name='_sigfault' type-id='e7f43fea' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='104' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_sigpoll' type-id='e7f43fec' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='110' column='1'/>
+          <var-decl name='_sigpoll' type-id='e7f43feb' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='110' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_sigsys' type-id='e7f43fed' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='117' column='1'/>
+          <var-decl name='_sigsys' type-id='e7f43fec' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='117' column='1'/>
         </data-member>
       </union-decl>
       <pointer-type-def type-id='93553610' size-in-bits='64' id='a609cc6a'/>
@@ -77936,7 +77938,7 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='725' column='1' id='ac5ab5af'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd1' visibility='default' filepath='include/linux/skbuff.h' line='726' column='1'/>
+          <var-decl name='' type-id='e7f43fd0' visibility='default' filepath='include/linux/skbuff.h' line='726' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='rbnode' type-id='2a8a6332' visibility='default' filepath='include/linux/skbuff.h' line='740' column='1'/>
@@ -77963,7 +77965,7 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='761' column='1' id='ac5ab5b2'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd2' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1'/>
+          <var-decl name='' type-id='e7f43fd1' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='tcp_tsorted_anchor' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='766' column='1'/>
@@ -77977,7 +77979,7 @@
           <var-decl name='csum' type-id='fbd88bba' visibility='default' filepath='include/linux/skbuff.h' line='884' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd3' visibility='default' filepath='include/linux/skbuff.h' line='885' column='1'/>
+          <var-decl name='' type-id='e7f43fd2' visibility='default' filepath='include/linux/skbuff.h' line='885' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='896' column='1' id='ac5ab5b4'>
@@ -78862,7 +78864,7 @@
           <var-decl name='cnts' type-id='49178f86' visibility='default' filepath='include/asm-generic/qrwlock_types.h' line='15' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fbc' visibility='default' filepath='include/asm-generic/qrwlock_types.h' line='16' column='1'/>
+          <var-decl name='' type-id='e7f43fbb' visibility='default' filepath='include/asm-generic/qrwlock_types.h' line='16' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/cred.h' line='149' column='1' id='ac5ab60b'>
@@ -78875,7 +78877,7 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/dcache.h' line='50' column='1' id='ac5ab60c'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fbd' visibility='default' filepath='include/linux/dcache.h' line='51' column='1'/>
+          <var-decl name='' type-id='e7f43fbc' visibility='default' filepath='include/linux/dcache.h' line='51' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='hash_len' type-id='91ce1af9' visibility='default' filepath='include/linux/dcache.h' line='54' column='1'/>
@@ -78905,7 +78907,7 @@
           <var-decl name='nfs4_fl' type-id='b811a3f5' visibility='default' filepath='include/linux/fs.h' line='1163' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='afs' type-id='e7f43fbe' visibility='default' filepath='include/linux/fs.h' line='1168' column='1'/>
+          <var-decl name='afs' type-id='e7f43fbd' visibility='default' filepath='include/linux/fs.h' line='1168' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/iocontext.h' line='83' column='1' id='ac5ab610'>
@@ -78948,7 +78950,7 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='111' column='1' id='ac5ab614'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fbf' visibility='default' filepath='include/linux/key.h' line='112' column='1'/>
+          <var-decl name='' type-id='e7f43fbe' visibility='default' filepath='include/linux/key.h' line='112' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='x' type-id='7359adad' visibility='default' filepath='include/linux/key.h' line='121' column='1'/>
@@ -78975,7 +78977,7 @@
           <var-decl name='index_key' type-id='16ab8749' visibility='default' filepath='include/linux/key.h' line='240' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc0' visibility='default' filepath='include/linux/key.h' line='241' column='1'/>
+          <var-decl name='' type-id='e7f43fbf' visibility='default' filepath='include/linux/key.h' line='241' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='254' column='1' id='ac5ab618'>
@@ -78983,7 +78985,7 @@
           <var-decl name='payload' type-id='2888d74a' visibility='default' filepath='include/linux/key.h' line='255' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc1' visibility='default' filepath='include/linux/key.h' line='256' column='1'/>
+          <var-decl name='' type-id='e7f43fc0' visibility='default' filepath='include/linux/key.h' line='256' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/lockref.h' line='26' column='1' id='ac5ab619'>
@@ -78991,7 +78993,7 @@
           <var-decl name='lock_count' type-id='d3130597' visibility='default' filepath='include/linux/lockref.h' line='28' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc2' visibility='default' filepath='include/linux/lockref.h' line='30' column='1'/>
+          <var-decl name='' type-id='e7f43fc1' visibility='default' filepath='include/linux/lockref.h' line='30' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/memremap.h' line='120' column='1' id='ac5ab61a'>
@@ -79009,25 +79011,25 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='83' column='1' id='ac5ab61c'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc4' visibility='default' filepath='include/linux/mm_types.h' line='84' column='1'/>
+          <var-decl name='' type-id='e7f43fc3' visibility='default' filepath='include/linux/mm_types.h' line='84' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc5' visibility='default' filepath='include/linux/mm_types.h' line='102' column='1'/>
+          <var-decl name='' type-id='e7f43fc4' visibility='default' filepath='include/linux/mm_types.h' line='102' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc6' visibility='default' filepath='include/linux/mm_types.h' line='124' column='1'/>
+          <var-decl name='' type-id='e7f43fc5' visibility='default' filepath='include/linux/mm_types.h' line='124' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc7' visibility='default' filepath='include/linux/mm_types.h' line='151' column='1'/>
+          <var-decl name='' type-id='e7f43fc6' visibility='default' filepath='include/linux/mm_types.h' line='151' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc8' visibility='default' filepath='include/linux/mm_types.h' line='160' column='1'/>
+          <var-decl name='' type-id='e7f43fc7' visibility='default' filepath='include/linux/mm_types.h' line='160' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fc9' visibility='default' filepath='include/linux/mm_types.h' line='166' column='1'/>
+          <var-decl name='' type-id='e7f43fc8' visibility='default' filepath='include/linux/mm_types.h' line='166' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fca' visibility='default' filepath='include/linux/mm_types.h' line='180' column='1'/>
+          <var-decl name='' type-id='e7f43fc9' visibility='default' filepath='include/linux/mm_types.h' line='180' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='callback_head' type-id='e3d8ce29' visibility='default' filepath='include/linux/mm_types.h' line='197' column='1'/>
@@ -79060,7 +79062,7 @@
           <var-decl name='slab_list' type-id='72f469ec' visibility='default' filepath='include/linux/mm_types.h' line='126' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fcb' visibility='default' filepath='include/linux/mm_types.h' line='127' column='1'/>
+          <var-decl name='' type-id='e7f43fca' visibility='default' filepath='include/linux/mm_types.h' line='127' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='141' column='1' id='ac5ab620'>
@@ -79071,7 +79073,7 @@
           <var-decl name='counters' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='143' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fcc' visibility='default' filepath='include/linux/mm_types.h' line='144' column='1'/>
+          <var-decl name='' type-id='e7f43fcb' visibility='default' filepath='include/linux/mm_types.h' line='144' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='170' column='1' id='ac5ab621'>
@@ -79084,7 +79086,7 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='337' column='1' id='ac5ab622'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fcd' visibility='default' filepath='include/linux/mm_types.h' line='338' column='1'/>
+          <var-decl name='' type-id='e7f43fcc' visibility='default' filepath='include/linux/mm_types.h' line='338' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='vm_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/mm_types.h' line='346' column='1'/>
@@ -79092,7 +79094,7 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='379' column='1' id='ac5ab623'>
         <data-member access='public'>
-          <var-decl name='shared' type-id='e7f43fce' visibility='default' filepath='include/linux/mm_types.h' line='383' column='1'/>
+          <var-decl name='shared' type-id='e7f43fcd' visibility='default' filepath='include/linux/mm_types.h' line='383' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='anon_name' type-id='fb0d26e0' visibility='default' filepath='include/linux/mm_types.h' line='388' column='1'/>
@@ -79138,7 +79140,7 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/sysctl.h' line='136' column='1' id='ac5ab628'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd4' visibility='default' filepath='include/linux/sysctl.h' line='137' column='1'/>
+          <var-decl name='' type-id='e7f43fd3' visibility='default' filepath='include/linux/sysctl.h' line='137' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/sysctl.h' line='143' column='1'/>
@@ -79166,7 +79168,7 @@
           <var-decl name='nr_segs' type-id='7359adad' visibility='default' filepath='include/linux/uio.h' line='49' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd5' visibility='default' filepath='include/linux/uio.h' line='50' column='1'/>
+          <var-decl name='' type-id='e7f43fd4' visibility='default' filepath='include/linux/uio.h' line='50' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='xarray_start' type-id='69bf7bee' visibility='default' filepath='include/linux/uio.h' line='54' column='1'/>
@@ -79174,10 +79176,10 @@
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='64' column='1' id='ac5ab62b'>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd6' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1'/>
+          <var-decl name='' type-id='e7f43fd5' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd7' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1'/>
+          <var-decl name='' type-id='e7f43fd6' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='include/linux/user_namespace.h' line='25' column='1' id='ac5ab62c'>
@@ -79185,7 +79187,7 @@
           <var-decl name='extent' type-id='df6d2206' visibility='default' filepath='include/linux/user_namespace.h' line='26' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fd8' visibility='default' filepath='include/linux/user_namespace.h' line='27' column='1'/>
+          <var-decl name='' type-id='e7f43fd7' visibility='default' filepath='include/linux/user_namespace.h' line='27' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='352' is-anonymous='yes' visibility='default' filepath='include/net/inet_frag.h' line='80' column='1' id='ac5ab62d'>
@@ -79263,7 +79265,7 @@
           <var-decl name='preempt_count' type-id='91ce1af9' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='30' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='preempt' type-id='e7f43fdf' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='39' column='1'/>
+          <var-decl name='preempt' type-id='e7f43fde' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='39' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='15' column='1' id='ac5ab636'>
@@ -79271,21 +79273,21 @@
           <var-decl name='val' type-id='49178f86' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='16' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fe0' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='24' column='1'/>
+          <var-decl name='' type-id='e7f43fdf' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='24' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43fe1' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='28' column='1'/>
+          <var-decl name='' type-id='e7f43fe0' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='28' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='28' column='1' id='ac5ab637'>
         <data-member access='public'>
-          <var-decl name='futex' type-id='e7f43fe2' visibility='default' filepath='include/linux/restart_block.h' line='37' column='1'/>
+          <var-decl name='futex' type-id='e7f43fe1' visibility='default' filepath='include/linux/restart_block.h' line='37' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='nanosleep' type-id='e7f43fe3' visibility='default' filepath='include/linux/restart_block.h' line='47' column='1'/>
+          <var-decl name='nanosleep' type-id='e7f43fe2' visibility='default' filepath='include/linux/restart_block.h' line='47' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='poll' type-id='e7f43fe4' visibility='default' filepath='include/linux/restart_block.h' line='55' column='1'/>
+          <var-decl name='poll' type-id='e7f43fe3' visibility='default' filepath='include/linux/restart_block.h' line='55' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='42' column='1' id='ac5ab638'>
@@ -79325,13 +79327,13 @@
           <var-decl name='_addr_lsb' type-id='a2185560' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='86' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_addr_bnd' type-id='e7f43fee' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='92' column='1'/>
+          <var-decl name='_addr_bnd' type-id='e7f43fed' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='92' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_addr_pkey' type-id='e7f43fef' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='97' column='1'/>
+          <var-decl name='_addr_pkey' type-id='e7f43fee' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='97' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_perf' type-id='e7f43ff0' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='102' column='1'/>
+          <var-decl name='_perf' type-id='e7f43fef' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='102' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='896' is-anonymous='yes' visibility='default' filepath='include/linux/memcontrol.h' line='246' column='1' id='ac5ab63d'>
@@ -79347,7 +79349,7 @@
           <var-decl name='capabilities' type-id='d3130597' visibility='default' filepath='include/uapi/linux/perf_event.h' line='561' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='' type-id='e7f43ff2' visibility='default' filepath='include/uapi/linux/perf_event.h' line='562' column='1'/>
+          <var-decl name='' type-id='e7f43ff1' visibility='default' filepath='include/uapi/linux/perf_event.h' line='562' column='1'/>
         </data-member>
       </union-decl>
       <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/memcontrol.h' line='225' column='1' id='ac5ab63f'>
@@ -103288,7 +103290,7 @@
           <var-decl name='ipmr_seq' type-id='f0981eeb' visibility='default' filepath='include/net/netns/ipv6.h' line='112' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5248'>
-          <var-decl name='ip6addrlbl_table' type-id='e7f43fd9' visibility='default' filepath='include/net/netns/ipv6.h' line='117' column='1'/>
+          <var-decl name='ip6addrlbl_table' type-id='e7f43fd8' visibility='default' filepath='include/net/netns/ipv6.h' line='117' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5376'>
           <var-decl name='ioam6_data' type-id='cbd6e703' visibility='default' filepath='include/net/netns/ipv6.h' line='118' column='1'/>
@@ -104363,7 +104365,7 @@
       <pointer-type-def type-id='b083f9b9' size-in-bits='64' id='e05ae2cd'/>
       <class-decl name='blk_mq_hw_ctx' size-in-bits='5120' is-struct='yes' visibility='default' filepath='include/linux/blk-mq.h' line='17' column='1' id='e063028f'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='' type-id='e7f43fbb' visibility='default' filepath='include/linux/blk-mq.h' line='18' column='1'/>
+          <var-decl name='' type-id='e7f43ff4' visibility='default' filepath='include/linux/blk-mq.h' line='18' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <var-decl name='run_work' type-id='5ad6e0ef' visibility='default' filepath='include/linux/blk-mq.h' line='39' column='1'/>
@@ -107893,7 +107895,7 @@
           <var-decl name='rr_nr_running' type-id='f0981eeb' visibility='default' filepath='kernel/sched/sched.h' line='646' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='12992'>
-          <var-decl name='highest_prio' type-id='e7f43ff3' visibility='default' filepath='kernel/sched/sched.h' line='653' column='1'/>
+          <var-decl name='highest_prio' type-id='e7f43ff2' visibility='default' filepath='kernel/sched/sched.h' line='653' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='13056'>
           <var-decl name='rt_nr_migratory' type-id='f0981eeb' visibility='default' filepath='kernel/sched/sched.h' line='656' column='1'/>
@@ -109034,18 +109036,7 @@
           <var-decl name='oui' type-id='f0981eeb' visibility='default' filepath='include/linux/hdmi.h' line='403' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/blk-mq.h' line='18' column='1' id='e7f43fbb'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/blk-mq.h' line='20' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='dispatch' type-id='72f469ec' visibility='default' filepath='include/linux/blk-mq.h' line='28' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/blk-mq.h' line='33' column='1'/>
-        </data-member>
-      </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/asm-generic/qrwlock_types.h' line='16' column='1' id='e7f43fbc'>
+      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/asm-generic/qrwlock_types.h' line='16' column='1' id='e7f43fbb'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='wlocked' type-id='f9b06939' visibility='default' filepath='include/asm-generic/qrwlock_types.h' line='18' column='1'/>
         </data-member>
@@ -109053,7 +109044,7 @@
           <var-decl name='__lstate' type-id='930ea9f9' visibility='default' filepath='include/asm-generic/qrwlock_types.h' line='19' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/dcache.h' line='51' column='1' id='e7f43fbd'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/dcache.h' line='51' column='1' id='e7f43fbc'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='hash' type-id='19c2251e' visibility='default' filepath='include/linux/dcache.h' line='52' column='1'/>
         </data-member>
@@ -109061,7 +109052,7 @@
           <var-decl name='len' type-id='19c2251e' visibility='default' filepath='include/linux/dcache.h' line='52' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='1164' column='1' id='e7f43fbe'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='1164' column='1' id='e7f43fbd'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='link' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1165' column='1'/>
         </data-member>
@@ -109072,7 +109063,7 @@
           <var-decl name='debug_id' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1167' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='112' column='1' id='e7f43fbf'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='112' column='1' id='e7f43fbe'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='desc_len' type-id='1dc6a898' visibility='default' filepath='include/linux/key.h' line='114' column='1'/>
         </data-member>
@@ -109080,7 +109071,7 @@
           <var-decl name='desc' type-id='4a008bc3' visibility='default' filepath='include/linux/key.h' line='115' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='241' column='1' id='e7f43fc0'>
+      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='241' column='1' id='e7f43fbf'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='hash' type-id='7359adad' visibility='default' filepath='include/linux/key.h' line='242' column='1'/>
         </data-member>
@@ -109097,7 +109088,7 @@
           <var-decl name='description' type-id='26a90f95' visibility='default' filepath='include/linux/key.h' line='246' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='256' column='1' id='e7f43fc1'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/key.h' line='256' column='1' id='e7f43fc0'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='name_link' type-id='72f469ec' visibility='default' filepath='include/linux/key.h' line='258' column='1'/>
         </data-member>
@@ -109105,7 +109096,7 @@
           <var-decl name='keys' type-id='b58d1e12' visibility='default' filepath='include/linux/key.h' line='259' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/lockref.h' line='30' column='1' id='e7f43fc2'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/lockref.h' line='30' column='1' id='e7f43fc1'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/lockref.h' line='31' column='1'/>
         </data-member>
@@ -109113,7 +109104,7 @@
           <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/lockref.h' line='32' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm.h' line='535' column='1' id='e7f43fc3'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm.h' line='535' column='1' id='e7f43fc2'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='vma' type-id='2ae08426' visibility='default' filepath='include/linux/mm.h' line='536' column='1'/>
         </data-member>
@@ -109127,7 +109118,7 @@
           <var-decl name='address' type-id='7359adad' visibility='default' filepath='include/linux/mm.h' line='539' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='84' column='1' id='e7f43fc4'>
+      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='84' column='1' id='e7f43fc3'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='lru' type-id='72f469ec' visibility='default' filepath='include/linux/mm_types.h' line='90' column='1'/>
         </data-member>
@@ -109141,7 +109132,7 @@
           <var-decl name='private' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='100' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='102' column='1' id='e7f43fc5'>
+      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='102' column='1' id='e7f43fc4'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='pp_magic' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='107' column='1'/>
         </data-member>
@@ -109158,7 +109149,7 @@
           <var-decl name='' type-id='ac5ab61e' visibility='default' filepath='include/linux/mm_types.h' line='111' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='124' column='1' id='e7f43fc6'>
+      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='124' column='1' id='e7f43fc5'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='' type-id='ac5ab61f' visibility='default' filepath='include/linux/mm_types.h' line='125' column='1'/>
         </data-member>
@@ -109172,7 +109163,7 @@
           <var-decl name='' type-id='ac5ab620' visibility='default' filepath='include/linux/mm_types.h' line='141' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='151' column='1' id='e7f43fc7'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='151' column='1' id='e7f43fc6'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='compound_head' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='152' column='1'/>
         </data-member>
@@ -109189,7 +109180,7 @@
           <var-decl name='compound_nr' type-id='f0981eeb' visibility='default' filepath='include/linux/mm_types.h' line='158' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='160' column='1' id='e7f43fc8'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='160' column='1' id='e7f43fc7'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_compound_pad_1' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='161' column='1'/>
         </data-member>
@@ -109200,7 +109191,7 @@
           <var-decl name='deferred_list' type-id='72f469ec' visibility='default' filepath='include/linux/mm_types.h' line='164' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='166' column='1' id='e7f43fc9'>
+      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='166' column='1' id='e7f43fc8'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_pt_pad_1' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='167' column='1'/>
         </data-member>
@@ -109217,7 +109208,7 @@
           <var-decl name='ptl' type-id='fb4018a0' visibility='default' filepath='include/linux/mm_types.h' line='177' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='180' column='1' id='e7f43fca'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='180' column='1' id='e7f43fc9'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='pgmap' type-id='b1a5e68a' visibility='default' filepath='include/linux/mm_types.h' line='182' column='1'/>
         </data-member>
@@ -109225,7 +109216,7 @@
           <var-decl name='zone_device_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/mm_types.h' line='183' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='127' column='1' id='e7f43fcb'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='127' column='1' id='e7f43fca'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='next' type-id='02f11ed4' visibility='default' filepath='include/linux/mm_types.h' line='128' column='1'/>
         </data-member>
@@ -109236,7 +109227,7 @@
           <var-decl name='pobjects' type-id='95e97e5e' visibility='default' filepath='include/linux/mm_types.h' line='131' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='144' column='1' id='e7f43fcc'>
+      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='144' column='1' id='e7f43fcb'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='inuse' type-id='f0981eeb' visibility='default' filepath='include/linux/mm_types.h' line='145' column='1'/>
         </data-member>
@@ -109247,7 +109238,7 @@
           <var-decl name='frozen' type-id='f0981eeb' visibility='default' filepath='include/linux/mm_types.h' line='147' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='338' column='1' id='e7f43fcd'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='338' column='1' id='e7f43fcc'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='vm_start' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='340' column='1'/>
         </data-member>
@@ -109261,7 +109252,7 @@
           <var-decl name='vm_prev' type-id='2ae08426' visibility='default' filepath='include/linux/mm_types.h' line='343' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='380' column='1' id='e7f43fce'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='380' column='1' id='e7f43fcd'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='rb' type-id='2a8a6332' visibility='default' filepath='include/linux/mm_types.h' line='381' column='1'/>
         </data-member>
@@ -109269,7 +109260,7 @@
           <var-decl name='rb_subtree_last' type-id='7359adad' visibility='default' filepath='include/linux/mm_types.h' line='382' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='7808' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='436' column='1' id='e7f43fcf'>
+      <class-decl name='__anonymous_struct__' size-in-bits='7808' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='436' column='1' id='e7f43fce'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='mmap' type-id='2ae08426' visibility='default' filepath='include/linux/mm_types.h' line='437' column='1'/>
         </data-member>
@@ -109442,13 +109433,13 @@
           <var-decl name='pasid' type-id='19c2251e' visibility='default' filepath='include/linux/mm_types.h' line='621' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='7488'>
-          <var-decl name='lru_gen' type-id='e7f43fd0' visibility='default' filepath='include/linux/mm_types.h' line='637' column='1'/>
+          <var-decl name='lru_gen' type-id='e7f43fcf' visibility='default' filepath='include/linux/mm_types.h' line='637' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='7744'>
           <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/mm_types.h' line='640' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='624' column='1' id='e7f43fd0'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='624' column='1' id='e7f43fcf'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/mm_types.h' line='626' column='1'/>
         </data-member>
@@ -109459,7 +109450,7 @@
           <var-decl name='nodes' type-id='6a7d16bb' visibility='default' filepath='include/linux/mm_types.h' line='636' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='726' column='1' id='e7f43fd1'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='726' column='1' id='e7f43fd0'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='728' column='1'/>
         </data-member>
@@ -109470,7 +109461,7 @@
           <var-decl name='' type-id='ac5ab627' visibility='default' filepath='include/linux/skbuff.h' line='731' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1' id='e7f43fd2'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1' id='e7f43fd1'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_skb_refdst' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='763' column='1'/>
         </data-member>
@@ -109478,7 +109469,7 @@
           <var-decl name='destructor' type-id='0ef96694' visibility='default' filepath='include/linux/skbuff.h' line='764' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='885' column='1' id='e7f43fd3'>
+      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='885' column='1' id='e7f43fd2'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='csum_start' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='886' column='1'/>
         </data-member>
@@ -109486,7 +109477,7 @@
           <var-decl name='csum_offset' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='887' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/sysctl.h' line='137' column='1' id='e7f43fd4'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/sysctl.h' line='137' column='1' id='e7f43fd3'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='ctl_table' type-id='631dc3c1' visibility='default' filepath='include/linux/sysctl.h' line='138' column='1'/>
         </data-member>
@@ -109500,7 +109491,7 @@
           <var-decl name='nreg' type-id='95e97e5e' visibility='default' filepath='include/linux/sysctl.h' line='141' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uio.h' line='50' column='1' id='e7f43fd5'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uio.h' line='50' column='1' id='e7f43fd4'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='head' type-id='f0981eeb' visibility='default' filepath='include/linux/uio.h' line='51' column='1'/>
         </data-member>
@@ -109508,7 +109499,7 @@
           <var-decl name='start_head' type-id='f0981eeb' visibility='default' filepath='include/linux/uio.h' line='52' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1' id='e7f43fd6'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1' id='e7f43fd5'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='autask' type-id='79aea64f' visibility='default' filepath='include/linux/uprobes.h' line='66' column='1'/>
         </data-member>
@@ -109516,7 +109507,7 @@
           <var-decl name='vaddr' type-id='7359adad' visibility='default' filepath='include/linux/uprobes.h' line='67' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1' id='e7f43fd7'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1' id='e7f43fd6'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='dup_xol_work' type-id='e3d8ce29' visibility='default' filepath='include/linux/uprobes.h' line='71' column='1'/>
         </data-member>
@@ -109524,7 +109515,7 @@
           <var-decl name='dup_xol_addr' type-id='7359adad' visibility='default' filepath='include/linux/uprobes.h' line='72' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/user_namespace.h' line='27' column='1' id='e7f43fd8'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/user_namespace.h' line='27' column='1' id='e7f43fd7'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='forward' type-id='9b105293' visibility='default' filepath='include/linux/user_namespace.h' line='28' column='1'/>
         </data-member>
@@ -109532,7 +109523,7 @@
           <var-decl name='reverse' type-id='9b105293' visibility='default' filepath='include/linux/user_namespace.h' line='29' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/netns/ipv6.h' line='113' column='1' id='e7f43fd9'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/netns/ipv6.h' line='113' column='1' id='e7f43fd8'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='head' type-id='e151255a' visibility='default' filepath='include/net/netns/ipv6.h' line='114' column='1'/>
         </data-member>
@@ -109543,7 +109534,7 @@
           <var-decl name='seq' type-id='19c2251e' visibility='default' filepath='include/net/netns/ipv6.h' line='116' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='1976' column='1' id='e7f43fda'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='1976' column='1' id='e7f43fd9'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='upper' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1977' column='1'/>
         </data-member>
@@ -109551,7 +109542,7 @@
           <var-decl name='lower' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1978' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='409' column='1' id='e7f43fdb'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='409' column='1' id='e7f43fda'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='rmem_alloc' type-id='49178f86' visibility='default' filepath='include/net/sock.h' line='410' column='1'/>
         </data-member>
@@ -109565,7 +109556,7 @@
           <var-decl name='tail' type-id='0fbf3cfd' visibility='default' filepath='include/net/sock.h' line='413' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/tty.h' line='168' column='1' id='e7f43fdc'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/tty.h' line='168' column='1' id='e7f43fdb'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/tty.h' line='169' column='1'/>
         </data-member>
@@ -109579,7 +109570,7 @@
           <var-decl name='unused' type-id='c99b5ecd' visibility='default' filepath='include/linux/tty.h' line='172' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/tty.h' line='175' column='1' id='e7f43fdd'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/tty.h' line='175' column='1' id='e7f43fdc'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/tty.h' line='176' column='1'/>
         </data-member>
@@ -109599,7 +109590,7 @@
           <var-decl name='unused' type-id='c99b5ecd' visibility='default' filepath='include/linux/tty.h' line='181' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='4352' is-struct='yes' is-anonymous='yes' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='144' column='1' id='e7f43fde'>
+      <class-decl name='__anonymous_struct__' size-in-bits='4352' is-struct='yes' is-anonymous='yes' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='144' column='1' id='e7f43fdd'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='tp_value' type-id='7359adad' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='145' column='1'/>
         </data-member>
@@ -109610,7 +109601,7 @@
           <var-decl name='fpsimd_state' type-id='3cb82f3a' visibility='default' filepath='arch/arm64/include/asm/processor.h' line='147' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='31' column='1' id='e7f43fdf'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='31' column='1' id='e7f43fde'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='count' type-id='19c2251e' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='36' column='1'/>
         </data-member>
@@ -109618,7 +109609,7 @@
           <var-decl name='need_resched' type-id='19c2251e' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='37' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='24' column='1' id='e7f43fe0'>
+      <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='24' column='1' id='e7f43fdf'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='locked' type-id='f9b06939' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='25' column='1'/>
         </data-member>
@@ -109626,7 +109617,7 @@
           <var-decl name='pending' type-id='f9b06939' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='26' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='28' column='1' id='e7f43fe1'>
+      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='28' column='1' id='e7f43fe0'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='locked_pending' type-id='1dc6a898' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='29' column='1'/>
         </data-member>
@@ -109634,7 +109625,7 @@
           <var-decl name='tail' type-id='1dc6a898' visibility='default' filepath='include/asm-generic/qspinlock_types.h' line='30' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='30' column='1' id='e7f43fe2'>
+      <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='30' column='1' id='e7f43fe1'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='uaddr' type-id='f9409001' visibility='default' filepath='include/linux/restart_block.h' line='31' column='1'/>
         </data-member>
@@ -109654,7 +109645,7 @@
           <var-decl name='uaddr2' type-id='f9409001' visibility='default' filepath='include/linux/restart_block.h' line='36' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='39' column='1' id='e7f43fe3'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='39' column='1' id='e7f43fe2'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='clockid' type-id='a1c3b834' visibility='default' filepath='include/linux/restart_block.h' line='40' column='1'/>
         </data-member>
@@ -109668,7 +109659,7 @@
           <var-decl name='expires' type-id='91ce1af9' visibility='default' filepath='include/linux/restart_block.h' line='46' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='49' column='1' id='e7f43fe4'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/restart_block.h' line='49' column='1' id='e7f43fe3'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='ufds' type-id='3ac36db0' visibility='default' filepath='include/linux/restart_block.h' line='50' column='1'/>
         </data-member>
@@ -109685,7 +109676,7 @@
           <var-decl name='tv_nsec' type-id='7359adad' visibility='default' filepath='include/linux/restart_block.h' line='54' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/sched.h' line='699' column='1' id='e7f43fe5'>
+      <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/sched.h' line='699' column='1' id='e7f43fe4'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='blocked' type-id='f9b06939' visibility='default' filepath='include/linux/sched.h' line='700' column='1'/>
         </data-member>
@@ -109699,7 +109690,7 @@
           <var-decl name='need_mb' type-id='f9b06939' visibility='default' filepath='include/linux/sched.h' line='703' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/signal_types.h' line='13' column='1' id='e7f43fe6'>
+      <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/signal_types.h' line='13' column='1' id='e7f43fe5'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='si_signo' type-id='95e97e5e' visibility='default' filepath='include/linux/signal_types.h' line='13' column='1'/>
         </data-member>
@@ -109713,7 +109704,7 @@
           <var-decl name='_sifields' type-id='a60646cb' visibility='default' filepath='include/linux/signal_types.h' line='13' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='39' column='1' id='e7f43fe7'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='39' column='1' id='e7f43fe6'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_pid' type-id='63eb2bf2' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='40' column='1'/>
         </data-member>
@@ -109721,7 +109712,7 @@
           <var-decl name='_uid' type-id='70734f24' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='41' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='45' column='1' id='e7f43fe8'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='45' column='1' id='e7f43fe7'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_tid' type-id='c28acba6' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='46' column='1'/>
         </data-member>
@@ -109735,7 +109726,7 @@
           <var-decl name='_sys_private' type-id='95e97e5e' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='49' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='53' column='1' id='e7f43fe9'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='53' column='1' id='e7f43fe8'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_pid' type-id='63eb2bf2' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='54' column='1'/>
         </data-member>
@@ -109746,7 +109737,7 @@
           <var-decl name='_sigval' type-id='95506cfb' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='56' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='60' column='1' id='e7f43fea'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='60' column='1' id='e7f43fe9'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_pid' type-id='63eb2bf2' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='61' column='1'/>
         </data-member>
@@ -109763,7 +109754,7 @@
           <var-decl name='_stime' type-id='880ebc01' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='65' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='69' column='1' id='e7f43feb'>
+      <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='69' column='1' id='e7f43fea'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_addr' type-id='eaa32e2f' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='70' column='1'/>
         </data-member>
@@ -109771,7 +109762,7 @@
           <var-decl name='' type-id='ac5ab63c' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='79' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='107' column='1' id='e7f43fec'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='107' column='1' id='e7f43feb'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_band' type-id='bd54fe1a' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='108' column='1'/>
         </data-member>
@@ -109779,7 +109770,7 @@
           <var-decl name='_fd' type-id='95e97e5e' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='109' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='113' column='1' id='e7f43fed'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='113' column='1' id='e7f43fec'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_call_addr' type-id='eaa32e2f' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='114' column='1'/>
         </data-member>
@@ -109790,7 +109781,7 @@
           <var-decl name='_arch' type-id='f0981eeb' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='116' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='88' column='1' id='e7f43fee'>
+      <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='88' column='1' id='e7f43fed'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_dummy_bnd' type-id='8e100159' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='89' column='1'/>
         </data-member>
@@ -109801,7 +109792,7 @@
           <var-decl name='_upper' type-id='eaa32e2f' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='91' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='94' column='1' id='e7f43fef'>
+      <class-decl name='__anonymous_struct__' size-in-bits='96' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='94' column='1' id='e7f43fee'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_dummy_pkey' type-id='8e100159' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='95' column='1'/>
         </data-member>
@@ -109809,7 +109800,7 @@
           <var-decl name='_pkey' type-id='3f1a6b60' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='96' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='99' column='1' id='e7f43ff0'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='99' column='1' id='e7f43fef'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_data' type-id='7359adad' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='100' column='1'/>
         </data-member>
@@ -109817,7 +109808,7 @@
           <var-decl name='_type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='101' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='kernel/sched/sched.h' line='575' column='1' id='e7f43ff1'>
+      <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='kernel/sched/sched.h' line='575' column='1' id='e7f43ff0'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='lock' type-id='f5c90b3f' visibility='default' filepath='kernel/sched/sched.h' line='576' column='1'/>
         </data-member>
@@ -109834,7 +109825,7 @@
           <var-decl name='runnable_avg' type-id='7359adad' visibility='default' filepath='kernel/sched/sched.h' line='580' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/perf_event.h' line='562' column='1' id='e7f43ff2'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/perf_event.h' line='562' column='1' id='e7f43ff1'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='cap_bit0' type-id='d3130597' visibility='default' filepath='include/uapi/linux/perf_event.h' line='563' column='1'/>
         </data-member>
@@ -109857,7 +109848,7 @@
           <var-decl name='cap_____res' type-id='d3130597' visibility='default' filepath='include/uapi/linux/perf_event.h' line='570' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='kernel/sched/sched.h' line='648' column='1' id='e7f43ff3'>
+      <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='kernel/sched/sched.h' line='648' column='1' id='e7f43ff2'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='curr' type-id='95e97e5e' visibility='default' filepath='kernel/sched/sched.h' line='649' column='1'/>
         </data-member>
@@ -109865,7 +109856,7 @@
           <var-decl name='next' type-id='95e97e5e' visibility='default' filepath='kernel/sched/sched.h' line='651' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='kernel/sched/sched.h' line='697' column='1' id='e7f43ff4'>
+      <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='kernel/sched/sched.h' line='697' column='1' id='e7f43ff3'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='curr' type-id='91ce1af9' visibility='default' filepath='kernel/sched/sched.h' line='698' column='1'/>
         </data-member>
@@ -109873,6 +109864,17 @@
           <var-decl name='next' type-id='91ce1af9' visibility='default' filepath='kernel/sched/sched.h' line='699' column='1'/>
         </data-member>
       </class-decl>
+      <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/blk-mq.h' line='18' column='1' id='e7f43ff4'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/blk-mq.h' line='20' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='dispatch' type-id='72f469ec' visibility='default' filepath='include/linux/blk-mq.h' line='28' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/blk-mq.h' line='33' column='1'/>
+        </data-member>
+      </class-decl>
       <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/blkdev.h' line='170' column='1' id='e7f43ff5'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='icq' type-id='7c6e0e0c' visibility='default' filepath='include/linux/blkdev.h' line='171' column='1'/>
@@ -121286,7 +121288,7 @@
           <var-decl name='avg' type-id='629c8d83' visibility='default' filepath='kernel/sched/sched.h' line='571' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1536'>
-          <var-decl name='removed' type-id='e7f43ff1' visibility='default' filepath='kernel/sched/sched.h' line='581' column='1'/>
+          <var-decl name='removed' type-id='e7f43ff0' visibility='default' filepath='kernel/sched/sched.h' line='581' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2048'>
           <var-decl name='tg_load_avg_contrib' type-id='7359adad' visibility='default' filepath='kernel/sched/sched.h' line='584' column='1'/>
@@ -149424,6 +149426,32 @@
         <parameter type-id='95e97e5e' name='timeout' filepath='drivers/usb/core/message.c' line='138' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='usb_control_msg_recv' mangled-name='usb_control_msg_recv' filepath='drivers/usb/core/message.c' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_control_msg_recv'>
+        <parameter type-id='25e60cb2' name='dev' filepath='drivers/usb/core/message.c' line='263' column='1'/>
+        <parameter type-id='8f048e17' name='endpoint' filepath='drivers/usb/core/message.c' line='263' column='1'/>
+        <parameter type-id='8f048e17' name='request' filepath='drivers/usb/core/message.c' line='263' column='1'/>
+        <parameter type-id='8f048e17' name='requesttype' filepath='drivers/usb/core/message.c' line='264' column='1'/>
+        <parameter type-id='d315442e' name='value' filepath='drivers/usb/core/message.c' line='264' column='1'/>
+        <parameter type-id='d315442e' name='index' filepath='drivers/usb/core/message.c' line='264' column='1'/>
+        <parameter type-id='eaa32e2f' name='driver_data' filepath='drivers/usb/core/message.c' line='265' column='1'/>
+        <parameter type-id='d315442e' name='size' filepath='drivers/usb/core/message.c' line='265' column='1'/>
+        <parameter type-id='95e97e5e' name='timeout' filepath='drivers/usb/core/message.c' line='265' column='1'/>
+        <parameter type-id='3eb7c31c' name='memflags' filepath='drivers/usb/core/message.c' line='266' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
+      <function-decl name='usb_control_msg_send' mangled-name='usb_control_msg_send' filepath='drivers/usb/core/message.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_control_msg_send'>
+        <parameter type-id='25e60cb2' name='dev' filepath='drivers/usb/core/message.c' line='198' column='1'/>
+        <parameter type-id='8f048e17' name='endpoint' filepath='drivers/usb/core/message.c' line='198' column='1'/>
+        <parameter type-id='8f048e17' name='request' filepath='drivers/usb/core/message.c' line='198' column='1'/>
+        <parameter type-id='8f048e17' name='requesttype' filepath='drivers/usb/core/message.c' line='199' column='1'/>
+        <parameter type-id='d315442e' name='value' filepath='drivers/usb/core/message.c' line='199' column='1'/>
+        <parameter type-id='d315442e' name='index' filepath='drivers/usb/core/message.c' line='199' column='1'/>
+        <parameter type-id='eaa32e2f' name='driver_data' filepath='drivers/usb/core/message.c' line='200' column='1'/>
+        <parameter type-id='d315442e' name='size' filepath='drivers/usb/core/message.c' line='200' column='1'/>
+        <parameter type-id='95e97e5e' name='timeout' filepath='drivers/usb/core/message.c' line='200' column='1'/>
+        <parameter type-id='3eb7c31c' name='memflags' filepath='drivers/usb/core/message.c' line='201' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='usb_copy_descriptors' mangled-name='usb_copy_descriptors' filepath='drivers/usb/gadget/config.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_copy_descriptors'>
         <parameter type-id='f363a725' name='src' filepath='drivers/usb/gadget/config.c' line='122' column='1'/>
         <return type-id='f363a725'/>
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index c769a706e033..b5ff504e734e 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -2121,6 +2121,8 @@
   usb_bus_idr
   usb_bus_idr_lock
   usb_composite_setup_continue
+  usb_control_msg_recv
+  usb_control_msg_send
   usb_debug_root
   usb_decode_ctrl
   usb_ep_alloc_request