ANDROID: GKI: Fix up .xml file after merge with android11-5.4

Browse source

Because the .xml file can not handle being "merged" we had to pick one
side or the other in commit 276d190124 ("Merge branch 'android11-5.4'
into 'android11-5.4-lts'").

As the main android11-5.4 branch had added new symbols to be tracked, we
need to properly track them here as well to ensure there is no abi
breakage over time with the LTS releases.  So regenerate the .xml file
to properly handle them.

Leaf changes summary: 35 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 35 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

35 Added functions:

  [A] 'function void __ieee80211_schedule_txq(ieee80211_hw*, ieee80211_txq*, bool)'
  [A] 'function int dev_pm_genpd_set_performance_state(device*, unsigned int)'
  [A] 'function void* device_get_mac_address(device*, char*, int)'
  [A] 'function thermal_cooling_device* devm_thermal_of_cooling_device_register(device*, device_node*, char*, void*, const thermal_cooling_device_ops*)'
  [A] 'function sk_buff* ieee80211_beacon_get_template(ieee80211_hw*, ieee80211_vif*, ieee80211_mutable_offsets*)'
  [A] 'function void ieee80211_beacon_loss(ieee80211_vif*)'
  [A] 'function u8 ieee80211_csa_update_counter(ieee80211_vif*)'
  [A] 'function ieee80211_sta* ieee80211_find_sta_by_ifaddr(ieee80211_hw*, const u8*, const u8*)'
  [A] 'function void ieee80211_iter_chan_contexts_atomic(ieee80211_hw*, void (ieee80211_hw*, ieee80211_chanctx_conf*, void*)*, void*)'
  [A] 'function void ieee80211_iterate_stations_atomic(ieee80211_hw*, void (void*, ieee80211_sta*)*, void*)'
  [A] 'function void ieee80211_manage_rx_ba_offl(ieee80211_vif*, const u8*, unsigned int)'
  [A] 'function ieee80211_txq* ieee80211_next_txq(ieee80211_hw*, u8)'
  [A] 'function void ieee80211_sta_register_airtime(ieee80211_sta*, unsigned char, unsigned int, unsigned int)'
  [A] 'function void ieee80211_tdls_oper_request(ieee80211_vif*, const u8*, nl80211_tdls_operation, u16, gfp_t)'
  [A] 'function sk_buff* ieee80211_tx_dequeue(ieee80211_hw*, ieee80211_txq*)'
  [A] 'function void ieee80211_tx_rate_update(ieee80211_hw*, ieee80211_sta*, ieee80211_tx_info*)'
  [A] 'function void ieee80211_txq_get_depth(ieee80211_txq*, unsigned long int*, unsigned long int*)'
  [A] 'function bool ieee80211_txq_may_transmit(ieee80211_hw*, ieee80211_txq*)'
  [A] 'function void ieee80211_txq_schedule_start(ieee80211_hw*, u8)'
  [A] 'function void led_set_brightness_nosleep(led_classdev*, led_brightness)'
  [A] 'function int pcie_capability_write_word(pci_dev*, int, u16)'
  [A] 'function const char* reg_initiator_name(nl80211_reg_initiator)'
  [A] 'function int rproc_add(rproc*)'
  [A] 'function void rproc_add_subdev(rproc*, rproc_subdev*)'
  [A] 'function rproc* rproc_alloc(device*, const char*, const rproc_ops*, const char*, int)'
  [A] 'function int rproc_coredump_add_custom_segment(rproc*, dma_addr_t, size_t, void (rproc*, rproc_dump_segment*, void*)*, void*)'
  [A] 'function int rproc_coredump_add_segment(rproc*, dma_addr_t, size_t)'
  [A] 'function int rproc_del(rproc*)'
  [A] 'function u32 rproc_elf_get_boot_addr(rproc*, const firmware*)'
  [A] 'function void rproc_free(rproc*)'
  [A] 'function rproc* rproc_get_by_child(device*)'
  [A] 'function void rproc_remove_subdev(rproc*, rproc_subdev*)'
  [A] 'function void rproc_report_crash(rproc*, rproc_crash_type)'
  [A] 'function thermal_cooling_device* thermal_cooling_device_register(const char*, void*, const thermal_cooling_device_ops*)'
  [A] 'function void wiphy_read_of_freq_limits(wiphy*)'

Fixes: 276d190124 ("Merge branch 'android11-5.4' into 'android11-5.4-lts'")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3fb7d0c3171fa064c620dbbd9a089ab2eccbcaf3

...

This commit is contained in:

Greg Kroah-Hartman 2021-02-23 08:45:12 +01:00

parent 276d190124

commit 16f6caf91a

1 changed files with 1994 additions and 1285 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3225

android/abi_gki_aarch64.xml

View file

File diff suppressed because it is too large Load diff