From 53ccd64e3546382f4bdcc808e570cc46f1582d1e Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Thu, 17 Jun 2021 15:14:05 -0700 Subject: [PATCH] ANDROID: GKI: 6/18/2021 KMI update Set KMI_GENERATION=7 for 6/18 KMI update Leaf changes summary: 2925 artifacts changed Changed leaf types summary: 24 leaf types changed Removed/Changed/Added functions summary: 0 Removed, 2847 Changed, 3 Added functions Removed/Changed/Added variables summary: 0 Removed, 51 Changed, 0 Added variable 3 Added functions: [A] 'function void pci_disable_sriov(pci_dev*)' [A] 'function int pci_enable_sriov(pci_dev*, int)' [A] 'function int pci_vfs_assigned(pci_dev*)' 2847 functions with some sub-type change: [C] 'function int __traceiter_android_vh_gic_resume(void*, irq_domain*, void*)' at gic.h:15:1 has some sub-type changes: CRC (modversions) changed from 0x79c6efed to 0xd99a1ac6 parameter 3 of type 'void*' was removed parameter 2 of type 'irq_domain*' changed: pointer type changed from: 'irq_domain*' to: 'gic_chip_data*' [C] 'function void* PDE_DATA(const inode*)' at proc_fs.h:112:1 has some sub-type changes: CRC (modversions) changed from 0x121116eb to 0x1c3ef274 [C] 'function void __ClearPageMovable(page*)' at compaction.c:138:1 has some sub-type changes: CRC (modversions) changed from 0xc952c645 to 0xdc28d620 [C] 'function void __SetPageMovable(page*, address_space*)' at compaction.c:130:1 has some sub-type changes: CRC (modversions) changed from 0x6c94b8ab to 0xd7b7b883 ... 2843 omitted; 2846 symbols have only CRC changes 51 Changed variables: [C] 'pglist_data contig_page_data' was changed at memblock.c:96:1: CRC (modversions) changed from 0x1f395adc to 0x7ce0db01 type of variable changed: type size hasn't changed 1 data member insertion: 'bool proactive_compact_trigger', at offset 41152 (in bits) at mmzone.h:786:1 there are data member changes: 'unsigned long int totalreserve_pages' offset changed (by +64 bits) 3752 impacted interfaces [C] 'bus_type amba_bustype' was changed at bus.c:215:1: CRC (modversions) changed from 0x1782f569 to 0x13c06cac [C] 'neigh_table arp_tbl' was changed at arp.c:152:1: CRC (modversions) changed from 0x832f8bb5 to 0x56697f62 [C] 'const address_space_operations balloon_aops' was changed at balloon_compaction.c:253:1: CRC (modversions) changed from 0x31e6cab1 to 0xf0207a10 ... 47 omitted; 50 symbols have only CRC changes 'struct dev_pm_qos_request at pm_qos.h:107:1' changed (indirectly): type size changed from 576 to 704 (in bits) there are data member changes: type 'union {plist_node pnode; pm_qos_flags_request flr; freq_qos_request freq;}' of 'dev_pm_qos_request::data' changed: type size changed from 448 to 576 (in bits) there are data member changes: type 'struct freq_qos_request' of '__anonymous_union__::freq' changed: type size changed from 448 to 576 (in bits) 1 data member insertion: 'u64 android_oem_data1[2]', at offset 448 (in bits) at pm_qos.h:96:1 3755 impacted interfaces 'device* dev' offset changed (by +128 bits) 3752 impacted interfaces 'struct devfreq at devfreq.h:172:1' changed (indirectly): type size changed from 16512 to 16768 (in bits) there are data member changes: type 'struct dev_pm_qos_request' of 'devfreq::user_min_freq_req' changed, as reported earlier type 'struct dev_pm_qos_request' of 'devfreq::user_max_freq_req' changed, as reported earlier and offset changed from 9152 to 9280 (in bits) (by +128 bits) 10 ('unsigned long int scaling_min_freq' .. 'notifier_block nb_max') offsets changed (by +256 bits) 59 impacted interfaces 'struct driver_info at usbnet.h:94:1' changed: type size changed from 1152 to 1280 (in bits) 2 data member insertions: 'u64 android_kabi_reserved1', at offset 1152 (in bits) at usbnet.h:183:1 'u64 android_kabi_reserved2', at offset 1216 (in bits) at usbnet.h:184:1 10 impacted interfaces 'struct freq_qos_request at pm_qos.h:92:1' changed: details were reported earlier 'struct hc_driver at hcd.h:249:1' changed: type size changed from 2880 to 3136 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 2880 (in bits) at hcd.h:419:1 'u64 android_kabi_reserved2', at offset 2944 (in bits) at hcd.h:420:1 'u64 android_kabi_reserved3', at offset 3008 (in bits) at hcd.h:421:1 'u64 android_kabi_reserved4', at offset 3072 (in bits) at hcd.h:422:1 43 impacted interfaces 'struct pci_dev at pci.h:310:1' changed: type size changed from 19328 to 24768 (in bits) 3 data member insertions: 'union {pci_sriov* sriov; pci_dev* physfn;}', at offset 24128 (in bits) at pci.h:479:1 'u16 ats_cap', at offset 24192 (in bits) at pci.h:483:1 'u8 ats_stu', at offset 24208 (in bits) at pci.h:484:1 there are data member changes: type 'resource[11]' of 'pci_dev::resource' changed: type name changed from 'resource[11]' to 'resource[17]' array type size changed from 8448 to 13056 array type subrange 1 changed length from 11 to 17 7 ('bool match_driver' .. 'int rom_attr_enabled') offsets changed (by +4608 bits) type 'bin_attribute*[11]' of 'pci_dev::res_attr' changed: type name changed from 'bin_attribute*[11]' to 'bin_attribute*[17]' array type size changed from 704 to 1088 array type subrange 1 changed length from 11 to 17 and offset changed from 17216 to 21824 (in bits) (by +4608 bits) type 'bin_attribute*[11]' of 'pci_dev::res_attr_wc' changed: type name changed from 'bin_attribute*[11]' to 'bin_attribute*[17]' array type size changed from 704 to 1088 array type subrange 1 changed length from 11 to 17 and offset changed from 17920 to 22912 (in bits) (by +4992 bits) 2 ('const attribute_group** msi_irq_groups' .. 'pci_vpd* vpd') offsets changed (by +5376 bits) 'u16 acs_cap' offset changed (by +5472 bits) 8 ('phys_addr_t rom' .. 'u64 android_kabi_reserved4') offsets changed (by +5440 bits) 426 impacted interfaces 'struct pglist_data at mmzone.h:729:1' changed: details were reported earlier 'struct snd_compr at compress_driver.h:146:1' changed: type size changed from 7168 to 7808 (in bits) 3 data member insertions: 'char id[64]', at offset 7136 (in bits) at compress_driver.h:157:1 'snd_info_entry* proc_root', at offset 7680 (in bits) at compress_driver.h:158:1 'snd_info_entry* proc_info_entry', at offset 7744 (in bits) at compress_driver.h:159:1 70 impacted interfaces 'struct snd_pcm at pcm.h:509:1' changed (indirectly): type size changed from 15680 to 15808 (in bits) there are data member changes: 'snd_pcm_str streams[2]' size changed from 13440 to 13568 (in bits) (by +128 bits) 7 ('mutex open_mutex' .. 'bool no_device_suspend') offsets changed (by +128 bits) 97 impacted interfaces 'struct snd_pcm_str at pcm.h:488:1' changed: type size changed from 6720 to 6784 (in bits) 1 data member insertion: 'snd_info_entry* proc_root', at offset 256 (in bits) at pcm.h:500:1 there are data member changes: 2 ('snd_kcontrol* chmap_kctl' .. 'device dev') offsets changed (by +64 bits) 97 impacted interfaces 'struct snd_pcm_substream at pcm.h:442:1' changed: type size changed from 2944 to 3008 (in bits) 1 data member insertion: 'snd_info_entry* proc_root', at offset 2880 (in bits) at pcm.h:478:1 97 impacted interfaces 'struct tcpm_port at tcpm.c:298:1' changed: type size changed from 99328 to 99520 (in bits) 2 data member insertions: 'u32 snk_vdo_v1[6]', at offset 8768 (in bits) at tcpm.c:405:1 'unsigned int nr_snk_vdo_v1', at offset 8960 (in bits) at tcpm.c:406:1 there are data member changes: 8 ('u32 snk_vdo[6]' .. 'u32 supply_voltage') offsets changed (by +224 bits) 32 ('power_supply* psy' .. 'u8* logbuffer[1024]') offsets changed (by +192 bits) 17 impacted interfaces 'struct ufs_hba at ufshcd.h:720:1' changed: type size changed from 34176 to 35328 (in bits) 1 data member insertion: 'ufs_hba_monitor monitor', at offset 32320 (in bits) at ufshcd.h:866:1 there are data member changes: 5 ('ufs_crypto_capabilities crypto_capabilities' .. 'dentry* debugfs_root') offsets changed (by +1152 bits) 37 impacted interfaces 'struct ufshcd_lrb at ufshcd.h:193:1' changed: type size hasn't changed 1 data member deletion: 'bool in_use', at offset 1096 (in bits) at ufshcd.h:221:1 37 impacted interfaces 'struct urb at usb.h:1563:1' changed: type size changed from 1472 to 1728 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 1472 (in bits) at usb.h:1625:1 'u64 android_kabi_reserved2', at offset 1536 (in bits) at usb.h:1626:1 'u64 android_kabi_reserved3', at offset 1600 (in bits) at usb.h:1627:1 'u64 android_kabi_reserved4', at offset 1664 (in bits) at usb.h:1628:1 there are data member changes: 'usb_iso_packet_descriptor iso_frame_desc[]' offset changed (by +256 bits) 62 impacted interfaces 'struct usb_bus at usb.h:424:1' changed: type size changed from 1152 to 1408 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 1152 (in bits) at usb.h:480:1 'u64 android_kabi_reserved2', at offset 1216 (in bits) at usb.h:481:1 'u64 android_kabi_reserved3', at offset 1280 (in bits) at usb.h:482:1 'u64 android_kabi_reserved4', at offset 1344 (in bits) at usb.h:483:1 86 impacted interfaces 'struct usb_device at usb.h:631:1' changed: type size changed from 11456 to 11712 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 11456 (in bits) at usb.h:729:1 'u64 android_kabi_reserved2', at offset 11520 (in bits) at usb.h:730:1 'u64 android_kabi_reserved3', at offset 11584 (in bits) at usb.h:731:1 'u64 android_kabi_reserved4', at offset 11648 (in bits) at usb.h:732:1 86 impacted interfaces 'struct usb_driver at usb.h:1186:1' changed: type size changed from 2176 to 2432 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 2176 (in bits) at usb.h:1235:1 'u64 android_kabi_reserved2', at offset 2240 (in bits) at usb.h:1236:1 'u64 android_kabi_reserved3', at offset 2304 (in bits) at usb.h:1237:1 'u64 android_kabi_reserved4', at offset 2368 (in bits) at usb.h:1238:1 2 impacted interfaces 'struct usb_hcd at hcd.h:81:1' changed: type size changed from 4992 to 5504 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 5248 (in bits) at hcd.h:229:1 'u64 android_kabi_reserved2', at offset 5312 (in bits) at hcd.h:230:1 'u64 android_kabi_reserved3', at offset 5376 (in bits) at hcd.h:231:1 'u64 android_kabi_reserved4', at offset 5440 (in bits) at hcd.h:232:1 there are data member changes: type 'struct usb_bus' of 'usb_hcd::self' changed, as reported earlier 27 ('kref' .. 'gen_pool* localmem_pool') offsets changed (by +256 bits) 'unsigned long int hcd_priv[]' offset changed (by +512 bits) 43 impacted interfaces 'struct usb_host_bos at usb.h:396:1' changed: type size changed from 384 to 640 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 384 (in bits) at usb.h:412:1 'u64 android_kabi_reserved2', at offset 448 (in bits) at usb.h:413:1 'u64 android_kabi_reserved3', at offset 512 (in bits) at usb.h:414:1 'u64 android_kabi_reserved4', at offset 576 (in bits) at usb.h:415:1 86 impacted interfaces 'struct usb_interface at usb.h:232:1' changed: type size changed from 7104 to 7360 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 7104 (in bits) at usb.h:262:1 'u64 android_kabi_reserved2', at offset 7168 (in bits) at usb.h:263:1 'u64 android_kabi_reserved3', at offset 7232 (in bits) at usb.h:264:1 'u64 android_kabi_reserved4', at offset 7296 (in bits) at usb.h:265:1 94 impacted interfaces 'struct usb_tt at hcd.h:554:1' changed: type size changed from 640 to 896 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 640 (in bits) at hcd.h:575:1 'u64 android_kabi_reserved2', at offset 704 (in bits) at hcd.h:576:1 'u64 android_kabi_reserved3', at offset 768 (in bits) at hcd.h:577:1 'u64 android_kabi_reserved4', at offset 832 (in bits) at hcd.h:578:1 86 impacted interfaces 'struct usbnet at usbnet.h:27:1' changed: type size changed from 5120 to 5376 (in bits) 4 data member insertions: 'u64 android_kabi_reserved1', at offset 5120 (in bits) at usbnet.h:89:1 'u64 android_kabi_reserved2', at offset 5184 (in bits) at usbnet.h:90:1 'u64 android_kabi_reserved3', at offset 5248 (in bits) at usbnet.h:91:1 'u64 android_kabi_reserved4', at offset 5312 (in bits) at usbnet.h:92:1 10 impacted interfaces 'struct vm_fault at mm.h:528:1' changed: type size changed from 1088 to 1216 (in bits) 1 data member insertion: 'u64 android_oem_data1[2]', at offset 1088 (in bits) at mm.h:576:1 3752 impacted interfaces Bug: 190227201 Signed-off-by: Sandeep Patil Signed-off-by: Greg Kroah-Hartman Change-Id: I1e308417a29408190a4deffa965edb454ca5c34d --- android/abi_gki_aarch64.xml | 11575 ++++++++++++----------- android/abi_gki_aarch64_virtual_device | 3 + build.config.common | 2 +- 3 files changed, 6035 insertions(+), 5545 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index b82c5041d331..03c128ac61e2 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1,16 +1,16 @@ - - - - + + + + - - + + - + @@ -25,29 +25,29 @@ - - - - - - - + + + + + + + - - - - + + + + - + - + - + @@ -55,33 +55,33 @@ - - - + + + - + - - + + - - + + - - + + - - - - - - - - - + + + + + + + + + @@ -91,21 +91,21 @@ - + - + - + - + - - - + + + @@ -124,93 +124,93 @@ - + - + - - + + - - - - - + + + + + - - + + - - - - - - + + + + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - + - + - - - - - - + + + + + + - - - - - - - - + + + + + + + + @@ -219,93 +219,93 @@ - - + + - + - - - + + + - + - - - + + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - + - - - + + + - - + + - + - - - - + + + + - + - - + + - - - + + + @@ -318,33 +318,33 @@ - + - - - + + + - - - + + + - + - + - + @@ -362,13 +362,13 @@ - + - + - - + + @@ -378,35 +378,35 @@ - - - - - - - + + + + + + + - + - - - + + + - + - + - - + + - - - + + + @@ -414,17 +414,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -453,22 +453,22 @@ - - + + - + - + - - + + @@ -477,26 +477,26 @@ - + - + - - - - + + + + - + - - - - + + + + - - + + @@ -507,44 +507,44 @@ - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -557,125 +557,125 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - + @@ -684,72 +684,72 @@ - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + @@ -763,19 +763,19 @@ - - - - - - - - - + + + + + + + + + - - - + + + @@ -784,7 +784,7 @@ - + @@ -794,18 +794,18 @@ - + - - - - + + + + - + @@ -818,17 +818,17 @@ - + - - - + + + - + @@ -843,35 +843,35 @@ - - - - - - - + + + + + + + - - - + + + - + - - + + - - + + - - - - + + + + @@ -883,183 +883,183 @@ - + - - - - + + + + - - - + + + - - + + - - - - + + + + - + - - - - - - - + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1068,131 +1068,131 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - - - - + + + + + + + + + - + @@ -1207,14 +1207,14 @@ - + - - - - + + + + @@ -1225,56 +1225,56 @@ - - + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - - + + + + + @@ -1288,36 +1288,36 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1335,57 +1335,57 @@ - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -1399,435 +1399,435 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - + + + + + - - - - - - + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - - + + - + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -1842,63 +1842,63 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - + - + - + - + - + - + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + @@ -1916,49 +1916,49 @@ - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - + + - + - - - - - - + + + + + + - - - + + + @@ -1966,11 +1966,11 @@ - - - - - + + + + + @@ -1978,40 +1978,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + @@ -2023,11 +2023,11 @@ - - - - - + + + + + @@ -2036,17 +2036,17 @@ - - - - - + + + + + - - + + @@ -2058,56 +2058,56 @@ - - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -2121,11 +2121,11 @@ - - + + - - + + @@ -2136,62 +2136,62 @@ - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -2205,17 +2205,17 @@ - + - - - - + + + + - + @@ -2250,64 +2250,64 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - + - + - - + + - - + + @@ -2359,49 +2359,49 @@ - + - - - + + + - - - - - + + + + + - + - + - - - - + + + + - + - - - - + + + + - - - - - - + + + + + + @@ -2416,8 +2416,8 @@ - - + + @@ -2426,7 +2426,7 @@ - + @@ -2446,27 +2446,27 @@ - - - - - - + + + + + + - - - - - + + + + + - - + + - - - - + + + + @@ -2493,24 +2493,24 @@ - - - - + + + + - + - - - + + + @@ -2524,12 +2524,12 @@ - - - - - - + + + + + + @@ -2558,103 +2558,103 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -2664,60 +2664,60 @@ - + - - - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - + + @@ -2727,18 +2727,18 @@ - - - - + + + + - - - + + + @@ -2750,68 +2750,68 @@ - + - - - - - - - - - - + + + + + + + + + + - - + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - - - + + + + + - + - + @@ -2823,16 +2823,16 @@ - - - + + + - + @@ -2844,11 +2844,11 @@ - - - - - + + + + + @@ -2862,125 +2862,128 @@ - + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2991,52 +2994,52 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -3059,29 +3062,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3091,30 +3094,30 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + @@ -3137,21 +3140,21 @@ - - - + + + - - - - - - - - + + + + + + + + @@ -3162,25 +3165,25 @@ - - - + + + - + - - - - - + + + + + - + @@ -3221,20 +3224,20 @@ - + - - - - - + + + + + - + @@ -3244,24 +3247,24 @@ - + - + - + - - + + - - + + @@ -3269,94 +3272,94 @@ - - + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - + - - - - + + + + - + @@ -3364,7 +3367,7 @@ - + @@ -3376,17 +3379,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -3398,158 +3401,158 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - - + + - + - + - + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -3557,14 +3560,14 @@ - - - - - + + + + + - - + + @@ -3575,33 +3578,33 @@ - - - - + + + + - - - - + + + + - + - - - + + + - + - + @@ -3610,70 +3613,70 @@ - - - - - + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3684,210 +3687,210 @@ - + - - + + - - + + - + - - - - + + + + - - - + + + - - - - + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -3915,7 +3918,7 @@ - + @@ -3937,13 +3940,13 @@ - - - - + + + + - + @@ -3954,38 +3957,38 @@ - + - + - - - + + + - + - - - - - + + + + + - + - - - + + + @@ -4002,22 +4005,22 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + @@ -4025,78 +4028,78 @@ - - - + + + - - - - - - + + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -4122,23 +4125,23 @@ - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -4146,68 +4149,68 @@ - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -4215,49 +4218,49 @@ - - + + - - - - - - + + + + + + - - - + + + - + - - - - - + + + + + - - - + + + - - + + - - - + + + - - + + - + @@ -4269,60 +4272,60 @@ - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + - + @@ -4331,243 +4334,243 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - + - + - - - + + + - - + + - - + + - - - + + + @@ -4582,26 +4585,26 @@ - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + @@ -4614,55 +4617,55 @@ - + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - + + - - + + @@ -4850,21 +4853,21 @@ - + - - + + - + - + @@ -4872,11 +4875,11 @@ - + - - - + + + @@ -4887,7 +4890,7 @@ - + @@ -4895,38 +4898,38 @@ - + - - - - + + + + - - + + - + - + - + - + - + @@ -4936,22 +4939,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -4960,20 +4963,20 @@ - + - + - - + + - - - + + + @@ -4992,16 +4995,16 @@ - - - + + + - + - - - + + + @@ -9971,27 +9974,27 @@ - + - + - + - + - + - + - + - + @@ -13770,15 +13773,15 @@ - + - + - + - - + + @@ -18419,7 +18422,7 @@ - + @@ -18658,15 +18661,15 @@ - + - + - + - + @@ -19176,7 +19179,7 @@ - + @@ -19186,6 +19189,9 @@ + + + @@ -19582,15 +19588,15 @@ - + - + - + - + @@ -21392,7 +21398,7 @@ - + @@ -24267,60 +24273,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -26384,31 +26390,34 @@ - + + + + - + - + - + - + - + - + - + - + @@ -27660,7 +27669,7 @@ - + @@ -33189,7 +33198,7 @@ - + @@ -34528,7 +34537,7 @@ - + @@ -36481,7 +36490,7 @@ - + @@ -36531,7 +36540,7 @@ - + @@ -36541,7 +36550,7 @@ - + @@ -36554,14 +36563,14 @@ - + - - + + @@ -36632,6 +36641,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -36689,8 +36778,8 @@ - - + + @@ -36784,7 +36873,7 @@ - + @@ -36951,9 +37040,9 @@ - + - + @@ -37064,61 +37153,70 @@ - + - + - + - + - + - + - - + + - - + + - + - + - + + + + + + + + + + - + - + - + - + - + - + - + - + @@ -37285,6 +37383,14 @@ + + + + + + + + @@ -37322,6 +37428,7 @@ + @@ -37411,6 +37518,9 @@ + + + @@ -38674,7 +38784,7 @@ - + @@ -38688,7 +38798,7 @@ - + @@ -38696,7 +38806,7 @@ - + @@ -38708,7 +38818,7 @@ - + @@ -38892,7 +39002,7 @@ - + @@ -38904,7 +39014,7 @@ - + @@ -38914,7 +39024,7 @@ - + @@ -39175,7 +39285,7 @@ - + @@ -40229,7 +40339,7 @@ - + @@ -43354,6 +43464,7 @@ + @@ -43386,6 +43497,7 @@ + @@ -43489,7 +43601,7 @@ - + @@ -44019,8 +44131,7 @@ - - + @@ -44138,9 +44249,9 @@ - - - + + + @@ -44609,24 +44720,24 @@ - + - + - + - + - + - + - + @@ -44661,7 +44772,7 @@ - + @@ -44885,124 +44996,130 @@ - + - + - + - - - - - - - - - - - - - - + + - + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + - - - - + - + - - - - - + + - + + + + + + + - + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + @@ -45100,344 +45217,344 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + @@ -45708,100 +45825,100 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -45845,52 +45962,87 @@ - + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -46244,12 +46396,12 @@ - + - + - + @@ -46498,7 +46650,7 @@ - + @@ -46535,37 +46687,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -47609,51 +47761,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -47685,70 +47837,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -47775,18 +47927,18 @@ - + - + - + - + - + @@ -47795,7 +47947,7 @@ - + @@ -47857,6 +48009,9 @@ + + + @@ -47876,12 +48031,12 @@ - + - + - + @@ -48012,18 +48167,18 @@ - + - + - + - + - + @@ -48140,89 +48295,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -48275,18 +48430,18 @@ - + - + - + - + - + @@ -51816,7 +51971,7 @@ - + @@ -68571,17 +68726,6 @@ - - - - - - - - - - - @@ -68593,6 +68737,17 @@ + + + + + + + + + + + @@ -83213,27 +83368,27 @@ - + - + - + - + - + - + - + - + @@ -88992,7 +89147,7 @@ - + @@ -89276,64 +89431,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -89376,6 +89531,9 @@ + + + @@ -89423,7 +89581,7 @@ - + @@ -98547,21 +98705,21 @@ - + - + - + - + - + - + @@ -112276,143 +112434,155 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + @@ -112423,445 +112593,487 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + - + - + - + - + - + @@ -112965,7 +113177,7 @@ - + @@ -112993,7 +113205,7 @@ - + @@ -113001,7 +113213,7 @@ - + @@ -113017,126 +113229,150 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - - - - + + - + - + - - + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113165,41 +113401,53 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -113239,9 +113487,9 @@ - + - + @@ -113400,15 +113648,15 @@ - + - + - + - + @@ -113419,179 +113667,197 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + @@ -113608,17 +113874,17 @@ - + - + - + @@ -113671,7 +113937,7 @@ - + @@ -113683,11 +113949,11 @@ - + - + @@ -113715,27 +113981,39 @@ - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -113757,127 +114035,151 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + @@ -113909,36 +114211,36 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -114024,7 +114326,7 @@ - + @@ -114072,311 +114374,335 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -114401,71 +114727,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + - + - + @@ -114512,24 +114850,36 @@ - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -114640,27 +114990,27 @@ - + - + - + - + - + - + - + - + @@ -114689,58 +115039,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + @@ -114772,26 +115122,26 @@ - + - + - + - + - + @@ -114803,7 +115153,7 @@ - + @@ -114856,7 +115206,7 @@ - + @@ -115108,6 +115458,20 @@ + + + + + + + + + + + + + + @@ -115131,190 +115495,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - + + - - - - + - - - - - - - - - - - - - - - - - - - + - + + + + - + + + + - + + + + + + + - + - - + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -115344,7 +115577,7 @@ - + @@ -115409,7 +115642,7 @@ - + @@ -115437,7 +115670,7 @@ - + @@ -115489,7 +115722,7 @@ - + @@ -115538,7 +115771,7 @@ - + @@ -115727,6 +115960,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -115794,21 +116225,8 @@ - - - - - - - - - - - - - @@ -115852,74 +116270,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -117096,6 +117446,9 @@ + + + @@ -117799,6 +118152,21 @@ + + + + + + + + + + + + + + + @@ -124380,6 +124748,9 @@ + + + @@ -124398,356 +124769,359 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -124784,72 +125158,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + @@ -124935,120 +125306,120 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -125119,41 +125490,41 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -125173,18 +125544,18 @@ - + - + - + - + - + @@ -125223,49 +125594,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -125273,15 +125644,15 @@ - + - + - + - + @@ -125378,57 +125749,57 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -125465,37 +125836,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -125513,59 +125884,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -125576,48 +125947,83 @@ - - - - - - - - - + - + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + @@ -125746,19 +126152,19 @@ - - - - - - + + + + + + - - - - - + + + + + @@ -125773,8 +126179,8 @@ - - + + @@ -125786,123 +126192,123 @@ - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + @@ -125914,13 +126320,13 @@ - - + + - - - + + + @@ -126741,18 +127147,18 @@ - + - + - + - - + + - + @@ -126760,15 +127166,15 @@ - + - + - + - + @@ -126779,7 +127185,7 @@ - + @@ -126789,6 +127195,9 @@ + + + @@ -130873,141 +131282,153 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -131138,152 +131559,164 @@ - + - + - - + + - - - - - - - - + + - + - - + + - - + + + + + - + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - + + - - + + - - + + - - + + - + + + + + + + + + + - + - - + + - - + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + @@ -132153,266 +132586,290 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - + - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -132614,27 +133071,27 @@ - + - + - + - + - + - + - + @@ -132696,7 +133153,7 @@ - + @@ -136657,7 +137114,7 @@ - + @@ -136685,33 +137142,33 @@ - + - + - + - + - + - + - + - + - + @@ -136728,9 +137185,12 @@ - + + + + @@ -136771,7 +137231,7 @@ - + @@ -136844,6 +137304,9 @@ + + + @@ -137855,7 +138318,7 @@ - + @@ -137864,7 +138327,7 @@ - + @@ -137937,6 +138400,9 @@ + + + @@ -137944,7 +138410,7 @@ - + @@ -137972,25 +138438,25 @@ - + - + - + - + - + - + - + @@ -138107,7 +138573,7 @@ - + @@ -138124,9 +138590,12 @@ - + + + + @@ -141564,9 +142033,9 @@ - - - + + + @@ -141574,64 +142043,64 @@ - - + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - + + @@ -141758,24 +142227,24 @@ - + - + - + - + - + - + - + @@ -141818,21 +142287,21 @@ - - + + - - + + - - - + + + - - + + @@ -141890,7 +142359,7 @@ - + @@ -142114,124 +142583,130 @@ - + - + - + - - - - - - - - - - - - - - + + - + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + - - - - + - + - - - - - + + - + + + + + + + - + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + @@ -142619,49 +143094,49 @@ - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + @@ -164780,7 +165255,12 @@ + + + + + @@ -164798,15 +165278,10 @@ - - - - - @@ -165304,7 +165779,7 @@ - + @@ -165777,7 +166252,7 @@ - + @@ -165805,7 +166280,7 @@ - + @@ -166368,7 +166843,7 @@ - + @@ -170443,7 +170918,7 @@ - + @@ -171901,7 +172376,7 @@ - + @@ -174101,7 +174576,7 @@ - + @@ -174252,7 +174727,7 @@ - + @@ -174266,15 +174741,15 @@ - + - - - - - + + + + + @@ -174335,21 +174810,21 @@ - + - + - + - + - + - + @@ -174387,7 +174862,7 @@ - + @@ -174520,66 +174995,66 @@ - - + + - - + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -174746,7 +175221,7 @@ - + @@ -174764,35 +175239,35 @@ - - + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + @@ -174967,7 +175442,7 @@ - + @@ -175052,15 +175527,15 @@ - + - + - + - + @@ -175261,7 +175736,7 @@ - + @@ -175296,7 +175771,7 @@ - + @@ -175557,31 +176032,34 @@ - + + + + - + - + - + - + - + - + - + - + @@ -175767,7 +176245,7 @@ - + @@ -175949,212 +176427,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -176244,7 +176522,7 @@ - + @@ -176296,7 +176574,7 @@ - + @@ -176414,22 +176692,11 @@ - - - - - - - - - - - @@ -176607,13 +176874,6 @@ - - - - - - - @@ -176626,10 +176886,6 @@ - - - - @@ -176857,23 +177113,23 @@ - + - + - + - + @@ -176910,7 +177166,7 @@ - + @@ -176918,7 +177174,7 @@ - + @@ -177128,7 +177384,7 @@ - + @@ -182823,7 +183079,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -182884,6 +183351,17 @@ + + + + + + + + + + + @@ -190194,7 +190672,7 @@ - + @@ -190219,6 +190697,15 @@ + + + + + + + + + diff --git a/android/abi_gki_aarch64_virtual_device b/android/abi_gki_aarch64_virtual_device index db3c296e0791..cdca090375a8 100644 --- a/android/abi_gki_aarch64_virtual_device +++ b/android/abi_gki_aarch64_virtual_device @@ -1233,6 +1233,8 @@ # required by virtio_pci.ko irq_set_affinity_hint pci_alloc_irq_vectors_affinity + pci_disable_sriov + pci_enable_sriov pci_find_capability pci_find_ext_capability pci_find_next_capability @@ -1242,6 +1244,7 @@ pci_irq_vector pci_release_selected_regions pci_request_selected_regions + pci_vfs_assigned synchronize_irq virtio_device_freeze virtio_device_restore diff --git a/build.config.common b/build.config.common index f6492831a7be..1bf50ec77079 100644 --- a/build.config.common +++ b/build.config.common @@ -1,5 +1,5 @@ BRANCH=android12-5.10 -KMI_GENERATION=6 +KMI_GENERATION=7 LLVM=1 DEPMOD=depmod