From d073dcb99839a6ed4cea6a5846965230753da252 Mon Sep 17 00:00:00 2001 From: Giuliano Procida Date: Tue, 20 Jul 2021 13:06:16 +0100 Subject: [PATCH] ANDROID: GKI: correct ABI XML bit field offsets Leaf changes summary: 129 artifacts changed Changed leaf types summary: 129 leaf types changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 'struct Scsi_Host at scsi_host.h:524:1' changed (indirectly): type size hasn't changed there are data member changes: 11 ('unsigned int active_mode' .. 'unsigned int no_scsi2_lun_in_cdb') offsets changed (by +4768 bits) 63 impacted interfaces 'struct _ddebug at dynamic_debug.h:14:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int lineno' .. 'unsigned int flags') offsets changed (by +256 bits) 2 impacted interfaces 'struct async_domain at async.h:18:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int registered' offset changed (by +128 bits) 2 impacted interfaces 'struct binder_buffer at binder_alloc.h:42:1' changed (indirectly): type size hasn't changed there are data member changes: 6 ('unsigned int free' .. 'unsigned int debug_id') offsets changed (by +320 bits) 4 impacted interfaces 'struct binder_transaction at binder_internal.h:547:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int need_reply' offset changed (by +576 bits) 4 impacted interfaces 'struct bpf_insn at bpf.h:65:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('__u8 dst_reg' .. '__u8 src_reg') offsets changed (by +8 bits) 3775 impacted interfaces 'struct bpf_prog at filter.h:525:1' changed (indirectly): type size hasn't changed there are data member changes: 11 ('u16 jited' .. 'u16 call_get_stack') offsets changed (by +16 bits) 3774 impacted interfaces 'struct cfg80211_pmsr_capabilities at cfg80211.h:4671:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('u8 report_ap_tsf' .. 'u8 randomize_mac_addr') offsets changed (by +32 bits) 3774 impacted interfaces 'struct cfg80211_pmsr_ftm_request_peer at cfg80211.h:3485:1' changed (indirectly): type size hasn't changed there are data member changes: 6 ('u8 requested' .. 'u8 non_trigger_based') offsets changed (by +48 bits) 2 impacted interfaces 'struct cfg80211_pmsr_request_peer at cfg80211.h:3507:1' changed (indirectly): type size hasn't changed there are data member changes: 'u8 report_ap_tsf' offset changed (by +320 bits) 2 impacted interfaces 'struct cgroup_subsys at cgroup-defs.h:621:1' changed (indirectly): type size hasn't changed there are data member changes: 5 ('bool early_init' .. 'bool warned_broken_hierarchy') offsets changed (by +1152 bits) 3774 impacted interfaces 'struct cpuidle_driver at cpuidle.h:122:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int bctimer' offset changed (by +128 bits) 3774 impacted interfaces 'struct dev_pm_info at pm.h:565:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int can_wakeup' offset changed (by +32 bits) 'unsigned int disable_depth' offset changed (by +1856 bits) 'bool early_init' offset changed (by +40 bits) 'bool ignore_children' offset changed (by +1864 bits) 'bool wakeup_path' offset changed (by +576 bits) 'unsigned int async_suspend' offset changed (by +32 bits) 'bool direct_complete' offset changed (by +40 bits) 'bool syscore' offset changed (by +576 bits) 'bool in_dpm_list' offset changed (by +32 bits) 'bool no_pm_callbacks' offset changed (by +576 bits) 'unsigned int idle_notification' offset changed (by +1856 bits) 'bool is_prepared' offset changed (by +32 bits) 'unsigned int must_resume' offset changed (by +576 bits) 'bool is_suspended' offset changed (by +32 bits) 'unsigned int may_skip_resume' offset changed (by +576 bits) 2 ('unsigned int request_pending' .. 'unsigned int deferred_resume') offsets changed (by +1856 bits) 2 ('bool is_noirq_suspended' .. 'bool is_late_suspended') offsets changed (by +32 bits) 'unsigned int needs_force_resume' offset changed (by +1856 bits) 'bool no_pm' offset changed (by +32 bits) 6 ('unsigned int runtime_auto' .. 'unsigned int memalloc_noio') offsets changed (by +1856 bits) 3774 impacted interfaces 'struct device at device.h:458:1' changed (indirectly): type size hasn't changed there are data member changes: 5 ('bool offline_disabled' .. 'bool dma_coherent') offsets changed (by +6336 bits) 3774 impacted interfaces 'struct device_private at base.h:88:1' changed (indirectly): type size hasn't changed there are data member changes: 'u8 dead' offset changed (by +1664 bits) 3774 impacted interfaces 'struct drm_atomic_state at drm_atomic.h:325:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('bool allow_modeset' .. 'bool duplicated') offsets changed (by +128 bits) 332 impacted interfaces 'struct drm_crtc_state at drm_crtc.h:99:1' changed (indirectly): type size hasn't changed there are data member changes: 7 ('bool planes_changed' .. 'bool no_vblank') offsets changed (by +80 bits) 332 impacted interfaces 'struct drm_dp_mst_topology_mgr at drm_dp_mst_helper.h:568:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('bool mst_state' .. 'bool payload_id_table_cleared') offsets changed (by +7168 bits) 18 impacted interfaces 'struct drm_gem_shmem_object at drm_gem_shmem_helper.h:23:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int pages_mark_dirty_on_put' .. 'unsigned int pages_mark_accessed_on_put') offsets changed (by +3392 bits) one impacted interface 'struct drm_vma_offset_node at drm_vma_manager.h:52:1' changed (indirectly): type size hasn't changed there are data member changes: 'bool readonly' offset changed (by +1472 bits) 332 impacted interfaces 'struct dwc3 at core.h:1100:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int connected' offset changed (by +9792 bits) 'unsigned int dis_del_phy_power_chg_quirk' offset changed (by +9824 bits) 'unsigned int delayed_status' offset changed (by +9792 bits) 'unsigned int dis_tx_ipgap_linecheck_quirk' offset changed (by +9824 bits) 'unsigned int ep0_bounced' offset changed (by +9792 bits) 'unsigned int parkmode_disable_ss_quirk' offset changed (by +9824 bits) 'unsigned int ep0_expect_in' offset changed (by +9792 bits) 'unsigned int tx_de_emphasis_quirk' offset changed (by +9824 bits) 'unsigned int has_hibernation' offset changed (by +9792 bits) 'unsigned int tx_de_emphasis' offset changed (by +9824 bits) 'unsigned int sysdev_is_parent' offset changed (by +9792 bits) 'unsigned int dis_metastability_quirk' offset changed (by +9824 bits) 'unsigned int has_lpm_erratum' offset changed (by +9792 bits) 'unsigned int dis_split_quirk' offset changed (by +9824 bits) 25 ('unsigned int is_utmi_l1_suspend' .. 'unsigned int dis_u2_freeclk_exists_quirk') offsets changed (by +9792 bits) 2 impacted interfaces 'struct dwc3_ep at core.h:704:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int direction' .. 'unsigned int stream_capable') offsets changed (by +1568 bits) 2 impacted interfaces 'struct dwc3_request at core.h:918:1' changed (indirectly): type size hasn't changed there are data member changes: 3 ('unsigned int needs_extra_trb' .. 'unsigned int mapped') offsets changed (by +1440 bits) 2 impacted interfaces 'struct elevator_queue at elevator.h:101:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int registered' offset changed (by +1280 bits) 3774 impacted interfaces 'struct fb_monspecs at fb.h:63:1' changed (indirectly): type size hasn't changed there are data member changes: '__u16 gtf' offset changed (by +1088 bits) 339 impacted interfaces 'struct fib6_info at ip6_fib.h:163:1' changed (indirectly): type size hasn't changed there are data member changes: 7 ('u8 should_flush' .. 'u8 unused') offsets changed (by +1072 bits) 3774 impacted interfaces 'struct fs_context at fs_context.h:90:1' changed (indirectly): type size hasn't changed there are data member changes: 'bool need_free' offset changed (by +1360 bits) 'fs_context_purpose purpose' offset changed (by +1344 bits) 2 ('bool global' .. 'bool oldapi') offsets changed (by +1360 bits) 'fs_context_phase phase' offset changed (by +1344 bits) 3774 impacted interfaces 'struct fs_parameter at fs_context.h:63:1' changed (indirectly): type size hasn't changed there are data member changes: 'fs_value_type type' offset changed (by +64 bits) 3774 impacted interfaces 'struct genl_family at genetlink.h:47:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('u8 netnsok' .. 'u8 parallel_ops') offsets changed (by +288 bits) 4 impacted interfaces 'struct gnss_device at gnss.h:37:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int disconnected' offset changed (by +8224 bits) 5 impacted interfaces 'struct hrtimer_cpu_base at hrtimer.h:217:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int hres_active' .. 'unsigned int softirq_activated') offsets changed (by +128 bits) 3788 impacted interfaces 'struct icc_node at interconnect-provider.h:95:1' changed (indirectly): type size hasn't changed there are data member changes: 'u8 is_traversed' offset changed (by +640 bits) 43 impacted interfaces 'struct ieee80211_tx_info at mac80211.h:1047:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('u32 band' .. 'u32 tx_time_est') offsets changed (by +32 bits) one impacted interface 'struct iio_chan_spec at iio.h:236:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int modified' .. 'unsigned int differential') offsets changed (by +1152 bits) 17 impacted interfaces 'struct irq_affinity_desc at interrupt.h:308:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int is_managed' offset changed (by +64 bits) 3774 impacted interfaces 'struct kernfs_open_file at kernfs.h:203:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('bool mmapped' .. 'bool released') offsets changed (by +1344 bits) 3774 impacted interfaces 'struct kobject at kobject.h:65:1' changed (indirectly): type size hasn't changed there are data member changes: 5 ('unsigned int state_initialized' .. 'unsigned int uevent_suppress') offsets changed (by +480 bits) 3774 impacted interfaces 'struct linux_binprm at binfmts.h:17:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int have_execfd' .. 'unsigned int point_of_no_return') offsets changed (by +320 bits) 3774 impacted interfaces 'struct mii_if_info at mii.h:18:1' changed (indirectly): type size hasn't changed there are data member changes: 3 ('unsigned int full_duplex' .. 'unsigned int supports_gmii') offsets changed (by +128 bits) 17 impacted interfaces 'struct mmc_csd at card.h:25:1' changed (indirectly): type size hasn't changed there are data member changes: 5 ('unsigned int read_partial' .. 'unsigned int dsr_imp') offsets changed (by +320 bits) 89 impacted interfaces 'struct mmc_host at host.h:279:1' changed (indirectly): type size hasn't changed there are data member changes: 11 ('unsigned int use_spi_crc' .. 'unsigned int can_dma_map_merge') offsets changed (by +7584 bits) 89 impacted interfaces 'struct msghdr at socket.h:50:1' changed (indirectly): type size hasn't changed there are data member changes: 'bool msg_control_is_user' offset changed (by +512 bits) 3774 impacted interfaces 'struct net_device at netdevice.h:1898:1' changed (indirectly): type size hasn't changed there are data member changes: '__anonymous_enum__ reg_state' offset changed (by +9536 bits) 'unsigned int wol_enabled' offset changed (by +17664 bits) '__anonymous_enum__ rtnl_link_state' offset changed (by +9536 bits) 3774 impacted interfaces 'struct nl_info at netlink.h:453:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('u8 skip_notify' .. 'u8 skip_notify_kernel') offsets changed (by +160 bits) one impacted interface 'struct pci_bus at pci.h:611:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int is_added' offset changed (by +9088 bits) 425 impacted interfaces 'struct pci_dev at pci.h:310:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int eetlp_prefix_path' offset changed (by +1408 bits) 'unsigned int ignore_hotplug' offset changed (by +1152 bits) 'unsigned int imm_ready' offset changed (by +1120 bits) 'unsigned int is_hotplug_bridge' offset changed (by +16416 bits) 'unsigned int ltr_path' offset changed (by +1344 bits) 'u8 pcie_mpss' offset changed (by +728 bits) 'unsigned int hotplug_user_indicators' offset changed (by +1152 bits) 'unsigned int shpc_managed' offset changed (by +16416 bits) 'unsigned int clear_retrain_link' offset changed (by +1152 bits) 7 ('unsigned int is_thunderbolt' .. 'unsigned int non_compliant_bars') offsets changed (by +16416 bits) 2 ('unsigned int transparent' .. 'unsigned int io_window') offsets changed (by +16384 bits) 2 ('unsigned int is_probed' .. 'unsigned int link_active_reporting') offsets changed (by +16416 bits) 'unsigned int pref_window' offset changed (by +16384 bits) 'unsigned int no_vf_scan' offset changed (by +16416 bits) 2 ('unsigned int pref_64_window' .. 'unsigned int multifunction') offsets changed (by +16384 bits) 'unsigned int no_command_memory' offset changed (by +16416 bits) 4 ('unsigned int is_busmaster' .. 'unsigned int block_cfg_access') offsets changed (by +16384 bits) 'unsigned int pme_support' offset changed (by +1120 bits) 4 ('unsigned int broken_parity_status' .. 'unsigned int msix_enabled') offsets changed (by +16384 bits) 'unsigned int pme_poll' offset changed (by +1120 bits) 'unsigned int ari_enabled' offset changed (by +16384 bits) 'unsigned int d1_support' offset changed (by +1120 bits) 'unsigned int ats_enabled' offset changed (by +16384 bits) 2 ('unsigned int d2_support' .. 'unsigned int no_d1d2') offsets changed (by +1120 bits) 'unsigned int pasid_enabled' offset changed (by +16384 bits) 'unsigned int no_d3cold' offset changed (by +1120 bits) 'unsigned int pri_enabled' offset changed (by +16384 bits) 'unsigned int bridge_d3' offset changed (by +1120 bits) 'unsigned int is_managed' offset changed (by +16384 bits) 'unsigned int d3cold_allowed' offset changed (by +1120 bits) 'unsigned int needs_freset' offset changed (by +16384 bits) 'unsigned int mmio_always_on' offset changed (by +1120 bits) 2 ('unsigned int state_saved' .. 'unsigned int is_physfn') offsets changed (by +16384 bits) 'unsigned int wakeup_prepared' offset changed (by +1120 bits) 'unsigned int is_virtfn' offset changed (by +16384 bits) 'unsigned int runtime_d3cold' offset changed (by +1120 bits) 'unsigned int reset_fn' offset changed (by +16384 bits) 'unsigned int skip_bus_pm' offset changed (by +1120 bits) 425 impacted interfaces 'struct pci_host_bridge at pci.h:530:1' changed (indirectly): type size hasn't changed there are data member changes: 11 ('unsigned int ignore_reset_delay' .. 'unsigned int msi_domain') offsets changed (by +7232 bits) 6 impacted interfaces 'struct pcie_link_state at aspm.c:49:1' changed (indirectly): type size hasn't changed there are data member changes: 'u32 aspm_disable' offset changed (by +416 bits) 2 ('u32 aspm_support' .. 'u32 aspm_enabled') offsets changed (by +384 bits) 4 ('u32 clkpm_capable' .. 'u32 clkpm_disable') offsets changed (by +416 bits) 2 ('u32 aspm_capable' .. 'u32 aspm_default') offsets changed (by +384 bits) 425 impacted interfaces 'struct percpu_ref_data at percpu-refcount.h:95:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('bool force_atomic' .. 'bool allow_reinit') offsets changed (by +192 bits) 3780 impacted interfaces 'struct perf_branch_entry at perf_event.h:1240:1' changed (indirectly): type size hasn't changed there are data member changes: 7 ('__u64 mispred' .. '__u64 reserved') offsets changed (by +128 bits) 3774 impacted interfaces 'struct perf_event_attr at perf_event.h:317:1' changed (indirectly): type size hasn't changed there are data member changes: 34 ('__u64 disabled' .. '__u64 __reserved_1') offsets changed (by +320 bits) 3774 impacted interfaces 'struct phy_configure_opts_dp at phy-dp.h:17:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('u8 ssc' .. 'u8 set_voltages') offsets changed (by +320 bits) 68 impacted interfaces 'struct phy_device at phy.h:540:1' changed (indirectly): type size hasn't changed there are data member changes: 14 ('unsigned int is_c45' .. 'unsigned int interrupts') offsets changed (by +8352 bits) 3774 impacted interfaces 'struct regmap_irq_chip at regmap.h:1387:1' changed (indirectly): type size hasn't changed there are data member changes: 'bool mask_writeonly' offset changed (by +448 bits) 'bool type_invert' offset changed (by +456 bits) 'bool init_ack_masked' offset changed (by +448 bits) 2 ('bool type_in_mask' .. 'bool clear_on_unmask') offsets changed (by +456 bits) 6 ('bool mask_invert' .. 'bool runtime_pm') offsets changed (by +448 bits) 6 impacted interfaces 'struct regmap_irq_chip_data at regmap-irq.c:20:1' changed (indirectly): type size hasn't changed there are data member changes: 'bool clear_status' offset changed (by +3584 bits) 6 impacted interfaces 'struct regulation_constraints at machine.h:139:1' changed (indirectly): type size hasn't changed there are data member changes: 7 ('unsigned int always_on' .. 'unsigned int over_current_protection') offsets changed (by +1344 bits) 377 impacted interfaces 'struct regulator at internal.h:34:1' changed (indirectly): type size hasn't changed there are data member changes: 3 ('unsigned int always_on' .. 'unsigned int device_link') offsets changed (by +192 bits) 377 impacted interfaces 'struct regulator_desc at driver.h:315:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int continuous_voltage_range' offset changed (by +416 bits) 377 impacted interfaces 'struct regulator_dev at driver.h:437:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int ena_gpio_state' .. 'unsigned int is_switch') offsets changed (by +9536 bits) 377 impacted interfaces 'struct request_sock at request_sock.h:53:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('u8 syncookie' .. 'u8 num_timeout') offsets changed (by +1176 bits) 3774 impacted interfaces 'struct rtable at route.h:49:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('u32 rt_mtu_locked' .. 'u32 rt_pmtu') offsets changed (by +1184 bits) 3774 impacted interfaces 'struct sched_dl_entity at sched.h:527:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int dl_throttled' .. 'unsigned int dl_overrun') offsets changed (by +672 bits) 3774 impacted interfaces 'struct scsi_device at scsi_device.h:101:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int fix_capacity' offset changed (by +2432 bits) 2 ('unsigned int removable' .. 'unsigned int changed') offsets changed (by +2400 bits) 'unsigned int guess_capacity' offset changed (by +2432 bits) 'unsigned int busy' offset changed (by +2400 bits) 2 ('unsigned int retry_hwerror' .. 'unsigned int last_sector_bug') offsets changed (by +2432 bits) 2 ('unsigned int lockable' .. 'unsigned int locked') offsets changed (by +2400 bits) 'unsigned int no_read_disc_info' offset changed (by +2432 bits) 'unsigned int borken' offset changed (by +2400 bits) 'unsigned int no_read_capacity_16' offset changed (by +2432 bits) 'unsigned int disconnect' offset changed (by +2400 bits) 2 ('unsigned int try_rc_10_first' .. 'unsigned int security_supported') offsets changed (by +2432 bits) 'unsigned int soft_reset' offset changed (by +2400 bits) 'unsigned int is_visible' offset changed (by +2432 bits) 'unsigned int sdtr' offset changed (by +2400 bits) 'unsigned int wce_default_on' offset changed (by +2432 bits) 'unsigned int wdtr' offset changed (by +2400 bits) 'unsigned int no_dif' offset changed (by +2432 bits) 'unsigned int ppr' offset changed (by +2400 bits) 'unsigned int broken_fua' offset changed (by +2432 bits) 'unsigned int tagged_supported' offset changed (by +2400 bits) 'unsigned int lun_in_cdb' offset changed (by +2432 bits) 'unsigned int simple_tags' offset changed (by +2400 bits) 'unsigned int unmap_limit_for_ws' offset changed (by +2432 bits) 2 ('unsigned int was_reset' .. 'unsigned int expecting_cc_ua') offsets changed (by +2400 bits) 'unsigned int rpm_autosuspend' offset changed (by +2432 bits) 17 ('unsigned int use_10_for_rw' .. 'unsigned int select_no_atn') offsets changed (by +2400 bits) 63 impacted interfaces 'struct scsi_host_template at scsi_host.h:32:1' changed (indirectly): type size hasn't changed there are data member changes: 7 ('unsigned int track_queue_depth' .. 'unsigned int host_tagset') offsets changed (by +2432 bits) 63 impacted interfaces 'struct scsi_target at scsi_device.h:289:1' changed (indirectly): type size hasn't changed there are data member changes: 5 ('unsigned int create' .. 'unsigned int expecting_lun_change') offsets changed (by +6816 bits) 63 impacted interfaces 'struct scsi_transport_template at scsi_transport.h:16:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int create_work_queue' offset changed (by +2720 bits) 63 impacted interfaces 'struct sdhci_host at sdhci.h:362:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int data_early' offset changed (by +6336 bits) 11 impacted interfaces 'struct sdio_cccr at card.h:192:1' changed (indirectly): type size hasn't changed there are data member changes: 6 ('unsigned int multi_block' .. 'unsigned int disable_cd') offsets changed (by +64 bits) 89 impacted interfaces 'struct signal_struct at signal.h:83:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int is_child_subreaper' .. 'unsigned int has_child_subreaper') offsets changed (by +960 bits) 3774 impacted interfaces 'struct sk_buff at skbuff.h:714:1' changed (indirectly): type size hasn't changed there are data member changes: '__u8 cloned' offset changed (by +1008 bits) '__u8 ipvs_property' offset changed (by +1048 bits) '__u8 l4_hash' offset changed (by +1032 bits) '__u8 pkt_type' offset changed (by +1024 bits) 2 ('__u8 vlan_present' .. '__u8 csum_complete_sw') offsets changed (by +1040 bits) '__u8 inner_protocol_type' offset changed (by +1048 bits) '__u8 nohdr' offset changed (by +1008 bits) '__u8 sw_hash' offset changed (by +1032 bits) '__u8 csum_level' offset changed (by +1040 bits) '__u8 fclone' offset changed (by +1008 bits) '__u8 remcsum_offload' offset changed (by +1048 bits) '__u8 wifi_acked_valid' offset changed (by +1032 bits) '__u8 ignore_df' offset changed (by +1024 bits) '__u8 tc_skip_classify' offset changed (by +1048 bits) '__u8 wifi_acked' offset changed (by +1032 bits) '__u8 csum_not_inet' offset changed (by +1040 bits) '__u8 nf_trace' offset changed (by +1024 bits) '__u8 no_fcs' offset changed (by +1032 bits) '__u8 peeked' offset changed (by +1008 bits) '__u8 tc_at_ingress' offset changed (by +1048 bits) '__u8 dst_pending_confirm' offset changed (by +1040 bits) '__u8 encapsulation' offset changed (by +1032 bits) '__u8 head_frag' offset changed (by +1008 bits) '__u8 ip_summed' offset changed (by +1024 bits) '__u8 redirected' offset changed (by +1048 bits) '__u8 encap_hdr_csum' offset changed (by +1032 bits) '__u8 from_ingress' offset changed (by +1048 bits) '__u8 ndisc_nodetype' offset changed (by +1040 bits) '__u8 pfmemalloc' offset changed (by +1008 bits) '__u8 csum_valid' offset changed (by +1032 bits) '__u8 ooo_okay' offset changed (by +1024 bits) 3774 impacted interfaces 'struct snd_ctl_elem_value at asound.h:1046:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int indirect' offset changed (by +512 bits) 134 impacted interfaces 'struct snd_hwdep at hwdep.h:39:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int exclusive' offset changed (by +9024 bits) one impacted interface 'struct snd_interval at asound.h:395:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int openmin' .. 'unsigned int empty') offsets changed (by +64 bits) 101 impacted interfaces 'struct snd_pcm_runtime at pcm.h:344:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int buffer_changed' offset changed (by +5888 bits) 'unsigned int no_period_wakeup' offset changed (by +1376 bits) 97 impacted interfaces 'struct snd_pcm_substream at pcm.h:442:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int hw_opened' offset changed (by +2880 bits) 'unsigned int timer_running' offset changed (by +1600 bits) 'unsigned int managed_buffer_alloc' offset changed (by +2880 bits) 97 impacted interfaces 'struct snd_soc_card at soc.h:982:1' changed (indirectly): type size hasn't changed there are data member changes: 5 ('unsigned int instantiated' .. 'unsigned int probed') offsets changed (by +6112 bits) 69 impacted interfaces 'struct snd_soc_component at soc-component.h:182:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int suspended' offset changed (by +352 bits) 69 impacted interfaces 'struct snd_soc_component_driver at soc-component.h:67:1' changed (indirectly): type size hasn't changed there are data member changes: 6 ('unsigned int module_get_upon_open' .. 'unsigned int non_legacy_dai_naming') offsets changed (by +2496 bits) 69 impacted interfaces 'struct snd_soc_dai at soc-dai.h:359:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int probed' offset changed (by +1024 bits) 69 impacted interfaces 'struct snd_soc_dai_driver at soc-dai.h:322:1' changed (indirectly): type size hasn't changed there are data member changes: 3 ('unsigned int symmetric_rates' .. 'unsigned int symmetric_samplebits') offsets changed (by +1664 bits) 69 impacted interfaces 'struct snd_soc_dai_link at soc.h:749:1' changed (indirectly): type size hasn't changed there are data member changes: 16 ('unsigned int nonatomic' .. 'unsigned int ignore') offsets changed (by +1024 bits) 69 impacted interfaces 'struct snd_soc_dai_ops at soc-dai.h:212:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int no_capture_mute' offset changed (by +1344 bits) 69 impacted interfaces 'struct snd_soc_dapm_context at soc-dapm.h:687:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int idle_bias_off' .. 'unsigned int suspend_bias_off') offsets changed (by +32 bits) 69 impacted interfaces 'struct snd_soc_dapm_widget at soc-dapm.h:616:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned char is_supply' offset changed (by +744 bits) 2 ('unsigned char power' .. 'unsigned char active') offsets changed (by +736 bits) 'unsigned char is_ep' offset changed (by +744 bits) 6 ('unsigned char connected' .. 'unsigned char power_checked') offsets changed (by +736 bits) 69 impacted interfaces 'struct snd_soc_pcm_runtime at soc.h:1132:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int pop_wait' .. 'unsigned int fe_compr') offsets changed (by +13696 bits) 69 impacted interfaces 'struct snd_usb_audio at usbaudio.h:24:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int txfr_quirk' .. 'unsigned int need_delayed_register') offsets changed (by +1984 bits) 3 impacted interfaces 'struct snd_usb_endpoint at card.h:56:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int fill_max' .. 'unsigned int tenor_fb_quirk') offsets changed (by +44256 bits) 2 impacted interfaces 'struct snd_usb_substream at card.h:126:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int running' offset changed (by +832 bits) 2 ('unsigned int txfr_quirk' .. 'unsigned int tx_length_quirk') offsets changed (by +704 bits) 2 impacted interfaces 'struct soc_enum at soc.h:1257:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int autodisable' offset changed (by +256 bits) one impacted interface 'struct sock at sock.h:348:1' changed (indirectly): type size hasn't changed there are data member changes: 'u8 sk_padding' offset changed (by +4352 bits) 'u8 sk_txtime_deadline_mode' offset changed (by +5160 bits) 'u8 sk_kern_sock' offset changed (by +4352 bits) 'u8 sk_txtime_report_errors' offset changed (by +5160 bits) 'u8 sk_no_check_tx' offset changed (by +4352 bits) 'u8 sk_txtime_unused' offset changed (by +5160 bits) 2 ('u8 sk_no_check_rx' .. 'u8 sk_userlocks') offsets changed (by +4352 bits) 3774 impacted interfaces 'struct sock_common at sock.h:163:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned char skc_reuse' .. 'unsigned char skc_net_refcnt') offsets changed (by +152 bits) 3774 impacted interfaces 'struct sock_reuseport at sock_reuseport.h:13:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int bind_inany' .. 'unsigned int has_conns') offsets changed (by +224 bits) 3774 impacted interfaces 'struct spi_message at spi.h:999:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int is_dma_mapped' offset changed (by +192 bits) 17 impacted interfaces 'struct spi_transfer at spi.h:926:1' changed (indirectly): type size hasn't changed there are data member changes: 3 ('unsigned int cs_change' .. 'unsigned int rx_nbits') offsets changed (by +576 bits) 18 impacted interfaces 'struct subsys_private at base.h:40:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int drivers_autoprobe' offset changed (by +3136 bits) 3774 impacted interfaces 'struct task_struct at sched.h:660:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int sched_remote_wakeup' offset changed (by +11328 bits) 'unsigned int sched_reset_on_fork' offset changed (by +11296 bits) 'unsigned int in_execve' offset changed (by +11328 bits) 'unsigned int sched_contributes_to_load' offset changed (by +11296 bits) 'unsigned int in_iowait' offset changed (by +11328 bits) 'unsigned int sched_migrated' offset changed (by +11296 bits) 'unsigned int no_cgroup_migration' offset changed (by +11328 bits) 'unsigned int sched_psi_wake_requeue' offset changed (by +11296 bits) 3 ('unsigned int frozen' .. 'unsigned int in_memstall') offsets changed (by +11328 bits) 3774 impacted interfaces 'struct tcpci_data at tcpci.h:185:1' changed (indirectly): type size hasn't changed there are data member changes: 3 ('unsigned char TX_BUF_BYTE_x_hidden' .. 'unsigned char vbus_vsafe0v') offsets changed (by +64 bits) 7 impacted interfaces 'struct tty_port at tty.h:230:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned char console' .. 'unsigned char low_latency') offsets changed (by +2112 bits) 3774 impacted interfaces 'struct tty_struct at tty.h:285:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned long int unused' offset changed (by +4480 bits) 'unsigned long int unused_ctrl' offset changed (by +4608 bits) 'unsigned long int ctrl_status' offset changed (by +4544 bits) 2 ('unsigned long int stopped' .. 'unsigned long int flow_stopped') offsets changed (by +4416 bits) 'unsigned long int packet' offset changed (by +4544 bits) 3774 impacted interfaces 'struct typec_altmode at typec_altmode.h:24:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int active' offset changed (by +6496 bits) 41 impacted interfaces 'struct typec_capability at typec.h:241:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int orientation_aware' offset changed (by +256 bits) 34 impacted interfaces 'struct typec_partner at class.c:33:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int usb_pd' offset changed (by +6400 bits) 28 impacted interfaces 'struct uart_8250_em485 at serial_8250.h:79:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int tx_stopped' offset changed (by +1280 bits) 4 impacted interfaces 'struct usb_anchor at usb.h:1362:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int poisoned' offset changed (by +384 bits) 62 impacted interfaces 'struct usb_bus at usb.h:424:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int is_b_host' .. 'unsigned int no_sg_constraint') offsets changed (by +256 bits) 86 impacted interfaces 'struct usb_composite_dev at composite.h:478:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int setup_pending' offset changed (by +1184 bits) 'unsigned int use_os_string' offset changed (by +448 bits) 'unsigned int os_desc_pending' offset changed (by +1184 bits) 'unsigned int suspended' offset changed (by +448 bits) 13 impacted interfaces 'struct usb_composite_driver at composite.h:388:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int needs_serial' offset changed (by +224 bits) 13 impacted interfaces 'struct usb_configuration at composite.h:302:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int superspeed' .. 'unsigned int superspeed_plus') offsets changed (by +704 bits) 13 impacted interfaces 'struct usb_device at usb.h:631:1' changed (indirectly): type size hasn't changed there are data member changes: 3 ('unsigned int do_remote_wakeup' .. 'unsigned int port_is_suspended') offsets changed (by +10880 bits) 9 ('unsigned int can_submit' .. 'unsigned int usb2_hw_lpm_besl_capable') offsets changed (by +10208 bits) 'unsigned int use_generic_driver' offset changed (by +11424 bits) 4 ('unsigned int usb2_hw_lpm_enabled' .. 'unsigned int usb3_lpm_u2_enabled') offsets changed (by +10208 bits) 86 impacted interfaces 'struct usb_driver at usb.h:1186:1' changed (indirectly): type size hasn't changed there are data member changes: 4 ('unsigned int no_dynamic_id' .. 'unsigned int soft_unbind') offsets changed (by +2112 bits) 2 impacted interfaces 'struct usb_ep at gadget.h:227:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int maxpacket_limit' offset changed (by +384 bits) 2 ('unsigned int mult' .. 'unsigned int maxburst') offsets changed (by +416 bits) 'unsigned int max_streams' offset changed (by +384 bits) 'unsigned int maxpacket' offset changed (by +352 bits) 91 impacted interfaces 'struct usb_function at composite.h:191:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int bind_deactivated' offset changed (by +1664 bits) 13 impacted interfaces 'struct usb_gadget at gadget.h:408:1' changed (indirectly): type size hasn't changed there are data member changes: 17 ('unsigned int sg_supported' .. 'unsigned int lpm_capable') offsets changed (by +7424 bits) 77 impacted interfaces 'struct usb_gadget_driver at gadget.h:717:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int match_existing_only' offset changed (by +1920 bits) 79 impacted interfaces 'struct usb_hcd at hcd.h:81:1' changed (indirectly): type size hasn't changed there are data member changes: 12 ('unsigned int rh_registered' .. 'unsigned int cant_recv_wakeups') offsets changed (by +2848 bits) 43 impacted interfaces 'struct usb_interface at usb.h:232:1' changed (indirectly): type size hasn't changed there are data member changes: 8 ('unsigned int sysfs_files_created' .. 'unsigned int authorized') offsets changed (by +320 bits) 94 impacted interfaces 'struct usb_request at gadget.h:101:1' changed (indirectly): type size hasn't changed there are data member changes: 6 ('unsigned int stream_id' .. 'unsigned int dma_mapped') offsets changed (by +320 bits) 91 impacted interfaces 'struct usbnet at usbnet.h:27:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int can_dma_sg' offset changed (by +960 bits) 10 impacted interfaces 'struct v4l2_ctrl at v4l2-ctrls.h:243:1' changed (indirectly): type size hasn't changed there are data member changes: 12 ('unsigned int done' .. 'unsigned int manual_mode_value') offsets changed (by +416 bits) 41 impacted interfaces 'struct v4l2_ctrl_config at v4l2-ctrls.h:415:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int is_private' offset changed (by +1024 bits) one impacted interface 'struct vb2_buffer at videobuf2-core.h:245:1' changed (indirectly): type size hasn't changed there are data member changes: 5 ('unsigned int synced' .. 'unsigned int need_cache_sync_on_finish') offsets changed (by +736 bits) 70 impacted interfaces 'struct vb2_fileio_buf at videobuf2-core.c:2463:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int queued' offset changed (by +128 bits) 70 impacted interfaces 'struct vb2_fileio_data at videobuf2-core.c:2494:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int read_once' .. 'unsigned int write_immediately') offsets changed (by +12544 bits) 70 impacted interfaces 'struct vb2_queue at videobuf2-core.h:567:1' changed (indirectly): type size hasn't changed there are data member changes: 'unsigned int bidirectional' offset changed (by +192 bits) 'unsigned int streaming' offset changed (by +6528 bits) 'unsigned int fileio_read_once' offset changed (by +192 bits) 2 ('unsigned int start_streaming_called' .. 'unsigned int error') offsets changed (by +6528 bits) 2 ('unsigned int fileio_write_immediately' .. 'unsigned int allow_zero_bytesused') offsets changed (by +192 bits) 'unsigned int waiting_for_buffers' offset changed (by +6528 bits) 'unsigned int quirk_poll_must_check_waiting_for_buffers' offset changed (by +192 bits) 2 ('unsigned int waiting_in_dqbuf' .. 'unsigned int is_multiplanar') offsets changed (by +6528 bits) 'unsigned int supports_requests' offset changed (by +192 bits) 'unsigned int is_output' offset changed (by +6528 bits) 'unsigned int requires_requests' offset changed (by +192 bits) 'unsigned int copy_timestamp' offset changed (by +6528 bits) 'unsigned int uses_qbuf' offset changed (by +192 bits) 'unsigned int last_buffer_dequeued' offset changed (by +6528 bits) 2 ('unsigned int uses_requests' .. 'unsigned int allow_cache_hints') offsets changed (by +192 bits) 70 impacted interfaces 'struct wakeup_source at pm_wakeup.h:43:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('bool active' .. 'bool autosleep_enabled') offsets changed (by +1600 bits) 3774 impacted interfaces 'struct wiphy at cfg80211.h:4899:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('u8 support_mbssid' .. 'u8 support_only_he_mbssid') offsets changed (by +10048 bits) 3774 impacted interfaces 'struct wireless_dev at cfg80211.h:5257:1' changed (indirectly): type size hasn't changed there are data member changes: 'u8 mgmt_registrations_need_update' offset changed (by +544 bits) 3774 impacted interfaces 'struct xdp_frame at xdp.h:94:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('u32 metasize' .. 'u32 frame_sz') offsets changed (by +96 bits) 3774 impacted interfaces 'struct xhci_hcd at xhci.h:1753:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int hw_lpm_support' .. 'unsigned int broken_suspend') offsets changed (by +57984 bits) 18 impacted interfaces Bug: 193271801 Change-Id: If48420b67bdfbd6c23abd12035f2c8eb7fbcd3e5 Signed-off-by: Giuliano Procida --- android/abi_gki_aarch64.xml | 1496 ++++++++++++++++++----------------- 1 file changed, 749 insertions(+), 747 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 8f98e0a1637b..c40cdec76ce4 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -5203,10 +5203,10 @@ - + - + @@ -6143,7 +6143,7 @@ - + @@ -9684,7 +9684,7 @@ - + @@ -12083,7 +12083,7 @@ - + @@ -12176,19 +12176,19 @@ - + - + - + - + - + @@ -12491,10 +12491,10 @@ - + - + @@ -12886,7 +12886,7 @@ - + @@ -13643,7 +13643,7 @@ - + @@ -14796,25 +14796,25 @@ - + - + - + - + - + - + - + @@ -15003,16 +15003,16 @@ - + - + - + - + @@ -15353,10 +15353,10 @@ - + - + @@ -15695,19 +15695,19 @@ - + - + - + - + - + @@ -16331,7 +16331,7 @@ - + @@ -17375,10 +17375,10 @@ - + - + @@ -17425,22 +17425,22 @@ - + - + - + - + - + - + @@ -17476,16 +17476,16 @@ - + - + - + - + @@ -17798,16 +17798,16 @@ - + - + - + - + @@ -19563,10 +19563,10 @@ - + - + @@ -20580,19 +20580,19 @@ - + - + - + - + - + @@ -21168,31 +21168,31 @@ - + - + - + - + - + - + - + - + - + @@ -21513,10 +21513,10 @@ - + - + @@ -21678,16 +21678,16 @@ - + - + - + - + @@ -21888,7 +21888,7 @@ - + @@ -23140,7 +23140,7 @@ - + @@ -23881,37 +23881,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -24380,37 +24380,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -24817,7 +24817,7 @@ - + @@ -24850,10 +24850,10 @@ - + - + @@ -25723,40 +25723,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -25816,7 +25816,7 @@ - + @@ -25990,43 +25990,43 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -26059,13 +26059,13 @@ - + - + - + @@ -26092,7 +26092,7 @@ - + @@ -27339,7 +27339,7 @@ - + @@ -29681,7 +29681,7 @@ - + @@ -29934,22 +29934,22 @@ - + - + - + - + - + - + @@ -30572,7 +30572,7 @@ - + @@ -31658,13 +31658,13 @@ - + - + - + @@ -32193,19 +32193,19 @@ - + - + - + - + - + @@ -32247,7 +32247,7 @@ - + @@ -32900,25 +32900,25 @@ - + - + - + - + - + - + @@ -33359,7 +33359,7 @@ - + @@ -36011,7 +36011,7 @@ - + @@ -36619,55 +36619,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -37935,7 +37935,7 @@ - + @@ -38133,10 +38133,10 @@ - + - + @@ -38207,16 +38207,16 @@ - + - + - + - + @@ -39198,13 +39198,13 @@ - + - + @@ -39267,7 +39267,7 @@ - + @@ -39491,28 +39491,28 @@ - + - + - + - + - + - + - + - + @@ -39703,52 +39703,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -39912,7 +39912,7 @@ - + @@ -39939,55 +39939,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -39999,13 +39999,13 @@ - + - + @@ -40026,112 +40026,112 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -40755,19 +40755,19 @@ - + - + - + - + - + @@ -41776,10 +41776,10 @@ - + - + @@ -42179,10 +42179,10 @@ - + - + @@ -42350,7 +42350,7 @@ - + @@ -43632,7 +43632,7 @@ - + @@ -44117,19 +44117,19 @@ - + - + - + - + - + @@ -45068,10 +45068,10 @@ - + - + @@ -45761,7 +45761,7 @@ - + @@ -46328,10 +46328,10 @@ - + - + @@ -46401,34 +46401,34 @@ - + - + - + - + - + - + - + - + - + - + @@ -46500,31 +46500,31 @@ - + - + - + - + - + - + - + - + - + @@ -47834,7 +47834,7 @@ - + @@ -49893,7 +49893,7 @@ - + @@ -50238,16 +50238,16 @@ - + - + - + - + @@ -51013,10 +51013,10 @@ - + - + @@ -51453,7 +51453,7 @@ - + @@ -52649,46 +52649,46 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -53296,10 +53296,10 @@ - + - + @@ -53466,10 +53466,10 @@ - + - + @@ -53700,7 +53700,7 @@ - + @@ -53822,22 +53822,22 @@ - + - + - + - + - + - + @@ -54385,19 +54385,19 @@ - + - + - + - + - + @@ -55140,121 +55140,121 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -55866,7 +55866,7 @@ - + @@ -56404,37 +56404,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -57234,16 +57234,16 @@ - + - + - + - + @@ -59707,16 +59707,16 @@ - + - + - + - + @@ -59879,10 +59879,10 @@ - + - + @@ -60310,19 +60310,19 @@ - + - + - + - + - + @@ -60369,16 +60369,16 @@ - + - + - + - + @@ -61878,25 +61878,25 @@ - + - + - + - + - + - + - + @@ -63745,7 +63745,7 @@ - + @@ -63935,10 +63935,10 @@ - + - + @@ -65582,10 +65582,10 @@ - + - + @@ -66201,13 +66201,13 @@ - + - + - + @@ -66364,7 +66364,7 @@ - + @@ -66917,7 +66917,7 @@ - + @@ -67941,22 +67941,22 @@ - + - + - + - + - + - + @@ -68352,13 +68352,13 @@ - + - + - + @@ -68876,19 +68876,19 @@ - + - + - + - + - + @@ -68954,13 +68954,13 @@ - + - + - + @@ -69123,7 +69123,7 @@ - + @@ -71130,37 +71130,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -71632,10 +71632,10 @@ - + - + @@ -71920,13 +71920,13 @@ - + - + - + @@ -72478,7 +72478,7 @@ - + @@ -73534,10 +73534,10 @@ - + - + @@ -73701,22 +73701,22 @@ - + - + - + - + - + - + @@ -73728,85 +73728,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -74754,13 +74754,13 @@ - + - + - + @@ -75305,7 +75305,7 @@ - + @@ -76079,7 +76079,7 @@ - + @@ -77093,22 +77093,22 @@ - + - + - + - + - + - + @@ -77539,19 +77539,19 @@ - + - + - + - + - + @@ -77673,7 +77673,7 @@ - + @@ -78623,10 +78623,10 @@ - + - + @@ -79451,7 +79451,7 @@ - + @@ -80173,37 +80173,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -80989,7 +80989,7 @@ - + @@ -81073,7 +81073,7 @@ - + @@ -82403,10 +82403,10 @@ - + - + @@ -82418,7 +82418,7 @@ - + @@ -82989,10 +82989,10 @@ - + - + @@ -83381,25 +83381,25 @@ - + - + - + - + - + - + - + @@ -83753,7 +83753,7 @@ - + @@ -88874,7 +88874,7 @@ - + @@ -89041,25 +89041,25 @@ - + - + - + - + - + - + - + @@ -89353,10 +89353,10 @@ - + - + @@ -90574,16 +90574,16 @@ - + - + - + - + @@ -91674,7 +91674,7 @@ - + @@ -91753,16 +91753,16 @@ - + - + - + - + @@ -92984,16 +92984,16 @@ - + - + - + - + @@ -93976,40 +93976,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -94283,7 +94283,7 @@ - + @@ -94385,10 +94385,10 @@ - + - + @@ -96245,145 +96245,145 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -98367,106 +98367,106 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -99778,10 +99778,10 @@ - + - + @@ -99811,10 +99811,10 @@ - + - + @@ -100075,10 +100075,10 @@ - + - + @@ -100349,25 +100349,25 @@ - + - + - + - + - + - + - + @@ -101137,7 +101137,7 @@ - + @@ -102295,7 +102295,7 @@ - + @@ -102348,7 +102348,7 @@ - + @@ -103886,34 +103886,34 @@ - + - + - + - + - + - + - + - + - + - + @@ -103931,19 +103931,19 @@ - + - + - + - + - + @@ -103967,40 +103967,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -104477,7 +104477,7 @@ - + @@ -104687,16 +104687,16 @@ - + - + - + - + @@ -105469,34 +105469,34 @@ - + - + - + - + - + - + - + - + - + - + @@ -105996,7 +105996,7 @@ - + @@ -106694,16 +106694,16 @@ - + - + - + - + @@ -106997,25 +106997,25 @@ - + - + - + - + - + - + - + @@ -107038,37 +107038,37 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -107628,7 +107628,7 @@ - + @@ -108879,13 +108879,13 @@ - + - + - + @@ -108971,10 +108971,10 @@ - + - + @@ -122108,6 +122108,7 @@ + @@ -133217,6 +133218,7 @@ +