Merge branch 'android12-5.10' into branch 'android12-5.10-lts'
Sync up with android12-5.10 for the following commits:
568ee90a7e ANDROID: fix execute bit on android/abi_gki_aarch64_asus
9ecb2fcca3 ANDROID: avoid huge-page not to clear trylock-bit after shrink_page_list.
548da5d23d ANDROID: vendor_hooks: Add hooks for oem futex optimization
3c2f107ad2 ANDROID: mm: memblock: avoid to create memmap for memblock nomap regions
97e5ac2b55 ANDROID: abi_gki_aarch64_qcom: Add android_vh_disable_thermal_cooling_stats
a3e8b04796 ANDROID: thermal: vendor hook to disable thermal cooling stats
a47cec9c43 ANDROID: GKI: Update symbols to symbol list
f32894eadf ANDROID: GKI: rockchip: update fragment file
052619d9e1 ANDROID: GKI: rockchip: Enable symbols bcmdhd-sdio
4f116d326e ANDROID: GKI: rockchip: Update symbols for rga driver
d1e180148e BACKPORT: cgroup: Fix threadgroup_rwsem <-> cpus_read_lock() deadlock
ef04c4095d UPSTREAM: cgroup: Elide write-locking threadgroup_rwsem when updating csses on an empty subtree
15ad83d91f ANDROID: GKI: Update symbol list for transsion
a47fb6a9ae ANDROID: vendor_hook: Add hook in __free_pages()
6c56a05b87 ANDROID: vendor_hooks: Add hooks to extend the struct swap_info_struct
7449d8120a ANDROID: vendor_hook: Add hook in si_swapinfo()
7ff95bd758 ANDROID: GKI: Update symbols to symbol list
04c766fa76 ANDROID: Use rq_clock_task without CONFIG_SMP
4e13870877 ANDROID: abi_gki_aarch64_qcom: Add skb and scatterlist helpers
86be1a3d9f Revert "ANDROID: vendor_hook: Add hook in si_swapinfo()"
40b3533213 Revert "ANDROID: vendor_hooks:vendor hook for pidfd_open"
d0590b99c9 Revert "ANDROID: vendor_hooks: Add hooks to extend the struct swap_info_struct"
501063ce66 Revert "ANDROID: vendor_hooks:vendor hook for mmput"
23fdb24a48 ANDROID: GKI: Update symbols to symbol list
567d65e536 ANDROID: Guard rq_clock_task_mult with CONFIG_SMP
eb99e6d80e Revert "ANDROID: vendor_hook: Add hook in __free_pages()"
8d86846781 Revert "ANDROID: vendor_hooks: Add hooks for binder"
eed2741ae6 ANDROID: vendor_hook: add hooks to protect locking-tsk in cpu scheduler
Update the .xml file to add the following new symbols that were now
started to be tracked in the android12-5.10 branch:
Leaf changes summary: 88 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 51 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 37 Added variables
51 Added functions:
[A] 'function int __traceiter_android_vh_account_swap_pages(void*, swap_info_struct*, bool*)'
[A] 'function int __traceiter_android_vh_alloc_si(void*, swap_info_struct**, bool*)'
[A] 'function int __traceiter_android_vh_alloc_swap_slot_cache(void*, swap_slots_cache*, int*, bool*)'
[A] 'function int __traceiter_android_vh_count_pswpin(void*, swap_info_struct*)'
[A] 'function int __traceiter_android_vh_count_pswpout(void*, swap_info_struct*)'
[A] 'function int __traceiter_android_vh_count_swpout_vm_event(void*, swap_info_struct*, page*, bool*)'
[A] 'function int __traceiter_android_vh_cow_user_page(void*, vm_fault*, page*)'
[A] 'function int __traceiter_android_vh_do_page_trylock(void*, page*, rw_semaphore*, bool*, bool*)'
[A] 'function int __traceiter_android_vh_drain_slots_cache_cpu(void*, swap_slots_cache*, unsigned int, bool, bool*)'
[A] 'function int __traceiter_android_vh_free_pages(void*, page*, unsigned int)'
[A] 'function int __traceiter_android_vh_free_swap_slot(void*, swp_entry_t, swap_slots_cache*, bool*)'
[A] 'function int __traceiter_android_vh_get_swap_page(void*, page*, swp_entry_t*, swap_slots_cache*, bool*)'
[A] 'function int __traceiter_android_vh_handle_failed_page_trylock(void*, list_head*)'
[A] 'function int __traceiter_android_vh_handle_pte_fault_end(void*, vm_fault*, unsigned long int)'
[A] 'function int __traceiter_android_vh_inactive_is_low(void*, unsigned long int, unsigned long int*, lru_list, bool*)'
[A] 'function int __traceiter_android_vh_init_swap_info_struct(void*, swap_info_struct*, plist_head*)'
[A] 'function int __traceiter_android_vh_migrate_page_states(void*, page*, page*)'
[A] 'function int __traceiter_android_vh_page_isolated_for_reclaim(void*, mm_struct*, page*)'
[A] 'function int __traceiter_android_vh_page_referenced_one_end(void*, vm_area_struct*, page*, int)'
[A] 'function int __traceiter_android_vh_page_trylock_clear(void*, page*)'
[A] 'function int __traceiter_android_vh_page_trylock_get_result(void*, page*, bool*)'
[A] 'function int __traceiter_android_vh_page_trylock_set(void*, page*)'
[A] 'function int __traceiter_android_vh_record_mutex_lock_starttime(void*, task_struct*, unsigned long int)'
[A] 'function int __traceiter_android_vh_record_percpu_rwsem_lock_starttime(void*, task_struct*, unsigned long int)'
[A] 'function int __traceiter_android_vh_record_rtmutex_lock_starttime(void*, task_struct*, unsigned long int)'
[A] 'function int __traceiter_android_vh_record_rwsem_lock_starttime(void*, task_struct*, unsigned long int)'
[A] 'function int __traceiter_android_vh_remove_vmalloc_stack(void*, vm_struct*)'
[A] 'function int __traceiter_android_vh_set_shmem_page_flag(void*, page*)'
[A] 'function int __traceiter_android_vh_si_swapinfo(void*, swap_info_struct*, bool*)'
[A] 'function int __traceiter_android_vh_snapshot_refaults(void*, lruvec*)'
[A] 'function int __traceiter_android_vh_swap_slot_cache_active(void*, bool)'
[A] 'function int __traceiter_android_vh_swapin_add_anon_rmap(void*, vm_fault*, page*)'
[A] 'function int __traceiter_android_vh_unuse_swap_page(void*, swap_info_struct*, page*)'
[A] 'function int __traceiter_android_vh_waiting_for_page_migration(void*, page*)'
[A] 'function unsigned long int alloc_iova_fast(iova_domain*, unsigned long int, unsigned long int, bool)'
[A] 'function void free_iova_fast(iova_domain*, unsigned long int, unsigned long int)'
[A] 'function int mmc_sw_reset(mmc_host*)'
[A] 'function int pinctrl_generic_add_group(pinctrl_dev*, const char*, int*, int, void*)'
[A] 'function int pinmux_generic_add_function(pinctrl_dev*, const char*, const char**, const unsigned int, void*)'
[A] 'function void plist_del(plist_node*, plist_head*)'
[A] 'function void plist_requeue(plist_node*, plist_head*)'
[A] 'function unsigned long int reclaim_pages(list_head*)'
[A] 'function u16 sdio_readw(sdio_func*, unsigned int, int*)'
[A] 'function void sdio_retune_crc_disable(sdio_func*)'
[A] 'function void sdio_retune_crc_enable(sdio_func*)'
[A] 'function void sdio_retune_hold_now(sdio_func*)'
[A] 'function void sdio_retune_release(sdio_func*)'
[A] 'function void sdio_writew(sdio_func*, u16, unsigned int, int*)'
[A] 'function bool sg_miter_skip(sg_mapping_iter*, off_t)'
[A] 'function int skb_copy_datagram_from_iter(sk_buff*, int, iov_iter*, int)'
[A] 'function sk_buff* sock_alloc_send_pskb(sock*, unsigned long int, unsigned long int, int, int*, int)'
37 Added variables:
[A] 'tracepoint __tracepoint_android_vh_account_swap_pages'
[A] 'tracepoint __tracepoint_android_vh_alloc_si'
[A] 'tracepoint __tracepoint_android_vh_alloc_swap_slot_cache'
[A] 'tracepoint __tracepoint_android_vh_count_pswpin'
[A] 'tracepoint __tracepoint_android_vh_count_pswpout'
[A] 'tracepoint __tracepoint_android_vh_count_swpout_vm_event'
[A] 'tracepoint __tracepoint_android_vh_cow_user_page'
[A] 'tracepoint __tracepoint_android_vh_disable_thermal_cooling_stats'
[A] 'tracepoint __tracepoint_android_vh_do_page_trylock'
[A] 'tracepoint __tracepoint_android_vh_drain_slots_cache_cpu'
[A] 'tracepoint __tracepoint_android_vh_free_pages'
[A] 'tracepoint __tracepoint_android_vh_free_swap_slot'
[A] 'tracepoint __tracepoint_android_vh_get_swap_page'
[A] 'tracepoint __tracepoint_android_vh_handle_failed_page_trylock'
[A] 'tracepoint __tracepoint_android_vh_handle_pte_fault_end'
[A] 'tracepoint __tracepoint_android_vh_inactive_is_low'
[A] 'tracepoint __tracepoint_android_vh_init_swap_info_struct'
[A] 'tracepoint __tracepoint_android_vh_migrate_page_states'
[A] 'tracepoint __tracepoint_android_vh_page_isolated_for_reclaim'
[A] 'tracepoint __tracepoint_android_vh_page_referenced_one_end'
[A] 'tracepoint __tracepoint_android_vh_page_trylock_clear'
[A] 'tracepoint __tracepoint_android_vh_page_trylock_get_result'
[A] 'tracepoint __tracepoint_android_vh_page_trylock_set'
[A] 'tracepoint __tracepoint_android_vh_record_mutex_lock_starttime'
[A] 'tracepoint __tracepoint_android_vh_record_percpu_rwsem_lock_starttime'
[A] 'tracepoint __tracepoint_android_vh_record_rtmutex_lock_starttime'
[A] 'tracepoint __tracepoint_android_vh_record_rwsem_lock_starttime'
[A] 'tracepoint __tracepoint_android_vh_remove_vmalloc_stack'
[A] 'tracepoint __tracepoint_android_vh_set_shmem_page_flag'
[A] 'tracepoint __tracepoint_android_vh_si_swapinfo'
[A] 'tracepoint __tracepoint_android_vh_snapshot_refaults'
[A] 'tracepoint __tracepoint_android_vh_swap_slot_cache_active'
[A] 'tracepoint __tracepoint_android_vh_swapin_add_anon_rmap'
[A] 'tracepoint __tracepoint_android_vh_unuse_swap_page'
[A] 'tracepoint __tracepoint_android_vh_waiting_for_page_migration'
[A] 'atomic_long_t nr_swap_pages'
[A] 'unsigned long int zero_pfn'
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I719eb9d92df0832855b90b31a5d2264b51dc0d96
a634d58881