Snap for 7529400 from 2c1a07949e to android12-5.10-keystone-qcom-release

Change-Id: I352275f822910b3a6ce46f76b6cec1e14b2a5b0f
This commit is contained in:
Android Build Coastguard Worker
2021-07-08 00:01:18 +00:00
22 changed files with 3783 additions and 1109 deletions

4
.gitignore vendored
View File

@@ -157,3 +157,7 @@ x509.genkey
# Documentation toolchain
sphinx_*/
# kernel/build configuration files
build.config.msm.*

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -15,18 +15,15 @@
__alloc_disk_node
alloc_etherdev_mqs
alloc_io_pgtable_ops
alloc_netdev_mqs
alloc_pages_exact
__alloc_pages_nodemask
__alloc_percpu
__alloc_skb
alloc_workqueue
all_vm_events
android_debug_symbol
android_rvh_probe_register
anon_inode_getfd
anon_inode_getfile
__arch_clear_user
__arch_copy_from_user
__arch_copy_to_user
arch_timer_read_counter
@@ -45,12 +42,10 @@
bio_endio
__bitmap_andnot
__bitmap_clear
__bitmap_equal
bitmap_find_free_region
bitmap_find_next_zero_area_off
bitmap_free
bitmap_from_arr32
__bitmap_or
bitmap_print_to_pagebuf
bitmap_release_region
__bitmap_set
@@ -82,7 +77,6 @@
bus_register
bus_set_iommu
bus_unregister
cache_line_size
cancel_delayed_work
cancel_delayed_work_sync
cancel_work_sync
@@ -101,7 +95,6 @@
class_for_each_device
__class_register
class_unregister
clear_page
__ClearPageMovable
clk_bulk_disable
clk_bulk_enable
@@ -209,8 +202,6 @@
cpumask_next_and
cpu_number
__cpu_online_mask
cpu_pm_register_notifier
cpu_pm_unregister_notifier
__cpu_possible_mask
__cpu_present_mask
cpu_scale
@@ -247,12 +238,12 @@
debugfs_create_file
debugfs_create_regset32
debugfs_create_symlink
debugfs_create_u16
debugfs_create_u32
debugfs_create_u64
debugfs_create_x32
debugfs_lookup
debugfs_remove
debug_locks_off
dec_zone_page_state
default_llseek
deferred_free
@@ -266,24 +257,19 @@
_dev_emerg
_dev_err
dev_err_probe
devfreq_add_device
devfreq_add_governor
devfreq_cooling_unregister
devfreq_get_devfreq_by_phandle
devfreq_monitor_resume
devfreq_monitor_start
devfreq_monitor_stop
devfreq_monitor_suspend
devfreq_recommended_opp
devfreq_register_opp_notifier
devfreq_remove_device
devfreq_remove_governor
devfreq_resume_device
devfreq_suspend_device
devfreq_unregister_opp_notifier
devfreq_update_interval
dev_fwnode
dev_get_by_name
dev_get_regmap
dev_get_stats
device_add
@@ -365,7 +351,6 @@
devm_phy_create
devm_phy_get
devm_pinctrl_get
devm_pinctrl_put
devm_pinctrl_register_and_init
devm_platform_ioremap_resource
devm_platform_ioremap_resource_byname
@@ -398,7 +383,6 @@
dev_pm_opp_add
dev_pm_opp_find_freq_ceil
dev_pm_opp_find_freq_ceil_by_volt
dev_pm_opp_find_freq_exact
dev_pm_opp_find_freq_floor
dev_pm_opp_get_freq
dev_pm_opp_get_level
@@ -410,9 +394,7 @@
dev_pm_opp_of_remove_table
dev_pm_opp_put
dev_pm_opp_put_opp_table
dev_pm_opp_put_regulators
dev_pm_opp_remove_all_dynamic
dev_pm_opp_set_regulators
dev_pm_qos_update_request
dev_printk
dev_queue_xmit
@@ -439,7 +421,6 @@
dma_buf_fd
dma_buf_get
dma_buf_map_attachment
dma_buf_mmap
dmabuf_page_pool_alloc
dmabuf_page_pool_create
dmabuf_page_pool_destroy
@@ -452,10 +433,8 @@
dma_fence_context_alloc
dma_fence_default_wait
dma_fence_free
dma_fence_get_status
dma_fence_init
dma_fence_release
dma_fence_remove_callback
dma_fence_signal
dma_fence_signal_locked
dma_fence_signal_timestamp_locked
@@ -487,17 +466,14 @@
dma_sync_sg_for_cpu
dma_sync_sg_for_device
dma_sync_single_for_cpu
dma_sync_single_for_device
dma_unmap_page_attrs
dma_unmap_resource
dma_unmap_sg_attrs
do_exit
do_wait_intr_irq
down
downgrade_write
down_interruptible
down_read
down_read_trylock
down_timeout
down_trylock
down_write
@@ -630,12 +606,15 @@
em_dev_register_perf_domain
enable_irq
enable_percpu_irq
ether_setup
eth_header
eth_header_cache
eth_header_cache_update
eth_header_parse
eth_type_trans
eth_mac_addr
eth_platform_get_mac_address
ethtool_op_get_link
ethtool_op_get_ts_info
eth_validate_addr
event_triggers_call
extcon_get_edev_by_phandle
extcon_get_state
@@ -676,19 +655,22 @@
freq_qos_add_request
freq_qos_remove_request
freq_qos_update_request
fsg_common_create_luns
fsg_common_set_cdev
fsg_common_set_inquiry_string
fsg_common_set_sysfs
fsg_config_from_params
fsync_bdev
fwnode_handle_get
fwnode_handle_put
fwnode_property_present
fwnode_property_read_string
fwnode_property_read_u32_array
gcd
generic_file_llseek
generic_handle_irq
generic_iommu_put_resv_regions
genlmsg_put
genl_register_family
genl_unregister_family
generic_mii_ioctl
genphy_resume
gen_pool_add_owner
gen_pool_alloc_algo_owner
gen_pool_avail
@@ -707,7 +689,6 @@
get_cpu_iowait_time_us
get_device
get_each_dmabuf
get_freelist_nr_pages
__get_free_pages
get_governor_parent_kobj
get_kernel_pages
@@ -719,7 +700,6 @@
get_task_mm
get_unused_fd_flags
get_user_pages
get_user_pages_fast
get_user_pages_remote
get_vaddr_frames
get_zeroed_page
@@ -739,7 +719,6 @@
gpiod_direction_output_raw
gpiod_get_raw_value
gpiod_set_debounce
gpiod_set_raw_value
gpiod_set_value
gpiod_set_value_cansleep
gpiod_to_irq
@@ -752,13 +731,7 @@
handle_simple_irq
hashlen_string
have_governor_per_policy
hci_alloc_dev
hci_free_dev
hci_recv_frame
hci_register_dev
hci_unregister_dev
hex_asc
hex_dump_to_buffer
hrtimer_active
hrtimer_cancel
hrtimer_forward
@@ -833,7 +806,6 @@
input_set_abs_params
input_set_capability
input_unregister_device
iomem_resource
iommu_alloc_resv_region
iommu_device_register
iommu_device_sysfs_add
@@ -878,12 +850,10 @@
irq_set_parent
irq_to_desc
irq_work_queue
irq_work_run
irq_work_sync
is_dma_buf_file
is_vmalloc_addr
iterate_fd
jiffies_64_to_clock_t
jiffies
jiffies_to_msecs
jiffies_to_usecs
@@ -900,7 +870,6 @@
__kfifo_alloc
__kfifo_free
__kfifo_in
__kfifo_init
__kfifo_out
__kfifo_to_user
kfree
@@ -920,7 +889,6 @@
kmem_cache_free
kobject_add
kobject_create_and_add
kobject_del
kobject_init
kobject_init_and_add
kobject_put
@@ -932,7 +900,6 @@
kstrdup_const
kstrndup
kstrtobool
kstrtobool_from_user
kstrtoint
kstrtoint_from_user
kstrtol_from_user
@@ -963,7 +930,6 @@
kthread_worker_fn
ktime_get
ktime_get_mono_fast_ns
ktime_get_raw
ktime_get_raw_ts64
ktime_get_real_ts64
ktime_get_ts64
@@ -1006,6 +972,10 @@
mbox_free_channel
mbox_request_channel
mbox_send_message
mdiobus_alloc_size
mdiobus_free
__mdiobus_register
mdiobus_unregister
media_create_intf_link
media_create_pad_link
media_device_cleanup
@@ -1024,7 +994,6 @@
memcpy
__memcpy_fromio
__memcpy_toio
memdup_user
memmove
memory_read_from_buffer
memparse
@@ -1035,6 +1004,12 @@
memstart_addr
memunmap
migrate_swap
mii_check_media
mii_ethtool_get_link_ksettings
mii_ethtool_gset
mii_ethtool_set_link_ksettings
mii_link_ok
mii_nway_restart
mipi_dsi_attach
mipi_dsi_dcs_read
mipi_dsi_dcs_write
@@ -1065,13 +1040,11 @@
mmc_remove_host
mmc_request_done
mmc_send_tuning
__mmdrop
mmput
mod_delayed_work_on
mod_timer
mod_timer_pending
module_layout
module_put
__msecs_to_jiffies
msleep
msleep_interruptible
@@ -1090,6 +1063,9 @@
nd_tbl
netdev_alloc_frag
__netdev_alloc_skb
netdev_err
netdev_info
netdev_warn
netif_carrier_off
netif_carrier_on
netif_napi_add
@@ -1097,24 +1073,18 @@
netif_receive_skb_list
netif_rx
netif_rx_ni
netif_tx_stop_all_queues
netif_tx_wake_queue
__netlink_kernel_create
netlink_kernel_release
netlink_unicast
net_namespace_list
nf_register_net_hooks
nf_unregister_net_hooks
__nla_parse
nla_put
nla_put_nohdr
__nlmsg_put
no_llseek
nonseekable_open
nr_cpu_ids
nsecs_to_jiffies
ns_to_timespec64
n_tty_ioctl_helper
__num_online_cpus
nvmem_cell_get
nvmem_cell_put
@@ -1135,7 +1105,6 @@
of_clk_src_simple_get
of_count_phandle_with_args
of_cpu_node_to_id
of_devfreq_cooling_register_power
of_device_get_match_data
of_device_is_available
of_device_is_compatible
@@ -1204,7 +1173,6 @@
of_remove_property
of_reserved_mem_device_init_by_idx
of_reserved_mem_lookup
of_root
of_thermal_get_trip_points
of_translate_address
on_each_cpu
@@ -1221,10 +1189,8 @@
param_get_uint
param_get_ulong
param_ops_bool
param_ops_byte
param_ops_charp
param_ops_int
param_ops_string
param_ops_uint
param_set_bool
param_set_charp
@@ -1238,20 +1204,28 @@
perf_event_enable
perf_event_release_kernel
perf_event_update_userpage
perf_num_counters
perf_pmu_migrate_context
perf_pmu_register
perf_pmu_unregister
perf_trace_buf_alloc
perf_trace_run_bpf_submit
pfn_valid
phy_connect
phy_disconnect
phy_do_ioctl_running
phy_ethtool_get_link_ksettings
phy_ethtool_nway_reset
phy_ethtool_set_link_ksettings
phy_exit
phy_get
phy_init
phy_power_off
phy_power_on
phy_print_status
phy_put
phy_set_mode_ext
phy_start
phy_stop
pid_task
pinconf_generic_parse_dt_config
pinctrl_dev_get_drvdata
@@ -1330,6 +1304,7 @@
proc_mkdir
proc_remove
proc_set_user
pskb_expand_head
put_device
put_disk
__put_page
@@ -1372,8 +1347,6 @@
rb_first
rb_insert_color
rb_next
rb_prev
rb_replace_node
rcu_idle_enter
rcu_idle_exit
__rcu_read_lock
@@ -1391,12 +1364,9 @@
__register_chrdev
register_chrdev_region
register_die_notifier
register_inetaddr_notifier
register_kprobe
register_module_notifier
register_netdev
register_netdevice
register_netdevice_notifier
register_oom_notifier
register_pernet_subsys
register_pm_notifier
@@ -1449,16 +1419,13 @@
regulator_sync_voltage
release_firmware
release_pages
__release_region
remap_pfn_range
remap_vmalloc_range
remove_proc_entry
remove_proc_subtree
remove_wait_queue
request_firmware
request_firmware_nowait
__request_percpu_irq
__request_region
request_threaded_irq
reset_control_assert
reset_control_deassert
@@ -1487,9 +1454,6 @@
rtc_tm_to_time64
rtc_update_irq
rtc_valid_tm
rtnl_is_locked
rtnl_lock
rtnl_unlock
runqueues
sched_clock
sched_feat_keys
@@ -1507,26 +1471,7 @@
scnprintf
scsi_device_quiesce
__scsi_iterate_devices
sdio_claim_host
sdio_claim_irq
sdio_disable_func
sdio_enable_func
sdio_f0_readb
sdio_f0_writeb
sdio_get_host_pm_caps
sdio_readb
sdio_readl
sdio_readsb
sdio_register_driver
sdio_release_host
sdio_release_irq
sdio_set_block_size
sdio_set_host_pm_flags
sdio_signal_irq
sdio_unregister_driver
sdio_writeb
sdio_writel
sdio_writesb
send_sig
seq_hex_dump
seq_lseek
@@ -1566,9 +1511,7 @@
sg_next
__sg_page_iter_next
__sg_page_iter_start
shmem_file_setup
si_mem_available
si_meminfo
simple_attr_open
simple_attr_read
simple_attr_release
@@ -1579,18 +1522,14 @@
single_open
single_release
skb_add_rx_frag
skb_clone
skb_copy
skb_dequeue
skb_copy_expand
skb_pull
skb_pull_rcsum
skb_push
skb_put
skb_queue_head
skb_queue_purge
skb_queue_tail
skb_realloc_headroom
skb_trim
smp_call_function_single
snd_card_add_dev_attr
snd_ctl_boolean_mono_info
snd_jack_set_key
@@ -1611,9 +1550,13 @@
snd_soc_card_jack_new
snd_soc_component_exit_regmap
snd_soc_component_init_regmap
snd_soc_component_read
snd_soc_component_update_bits
snd_soc_component_write
snd_soc_dai_set_sysclk
snd_soc_dapm_add_routes
snd_soc_dapm_disable_pin
snd_soc_dapm_enable_pin
snd_soc_dapm_get_enum_double
snd_soc_dapm_get_pin_switch
snd_soc_dapm_get_volsw
@@ -1623,6 +1566,7 @@
snd_soc_dapm_put_enum_double
snd_soc_dapm_put_pin_switch
snd_soc_dapm_put_volsw
snd_soc_dapm_sync
snd_soc_get_volsw
snd_soc_info_enum_double
snd_soc_info_volsw
@@ -1658,7 +1602,6 @@
spmi_register_write
spmi_register_zero_write
sprintf
sprint_symbol_no_offset
srcu_init_notifier_head
srcu_notifier_call_chain
srcu_notifier_chain_register
@@ -1669,11 +1612,13 @@
stack_trace_save
static_key_slow_dec
static_key_slow_inc
stpcpy
strcasecmp
strchr
strcmp
strcpy
strcspn
strim
strlcat
strlcpy
strlen
@@ -1684,12 +1629,10 @@
strncpy_from_user
strnlen
strnstr
strpbrk
strrchr
strreplace
strscpy
strsep
strspn
strstr
suspend_set_ops
__sw_hweight32
@@ -1716,7 +1659,6 @@
system_freezable_power_efficient_wq
system_freezing_cnt
system_highpri_wq
system_long_wq
system_power_efficient_wq
system_state
system_unbound_wq
@@ -1733,7 +1675,6 @@
__task_rq_lock
thermal_cooling_device_unregister
thermal_of_cooling_device_register
thermal_zone_device_update
thermal_zone_get_temp
thermal_zone_get_zone_by_name
tick_nohz_get_idle_calls_cpu
@@ -1800,13 +1741,11 @@
__traceiter_android_vh_set_wake_flags
__traceiter_android_vh_syscall_prctl_finished
__traceiter_cpu_frequency
__traceiter_gpu_mem_total
__traceiter_pelt_se_tp
__traceiter_rwmmio_post_read
__traceiter_rwmmio_read
__traceiter_rwmmio_write
__traceiter_sched_update_nr_running_tp
trace_output_call
__tracepoint_android_rvh_cpu_overutilized
__tracepoint_android_rvh_dequeue_task
__tracepoint_android_rvh_dequeue_task_fair
@@ -1857,7 +1796,6 @@
__tracepoint_android_vh_set_wake_flags
__tracepoint_android_vh_syscall_prctl_finished
__tracepoint_cpu_frequency
__tracepoint_gpu_mem_total
__tracepoint_pelt_se_tp
tracepoint_probe_register
tracepoint_probe_unregister
@@ -1866,23 +1804,17 @@
__tracepoint_rwmmio_write
__tracepoint_sched_update_nr_running_tp
tracepoint_srcu
trace_print_array_seq
trace_print_flags_seq
trace_print_symbols_seq
__trace_puts
trace_raw_output_prep
trace_seq_printf
trace_seq_putc
tracing_off
try_module_get
try_wait_for_completion
tty_driver_flush_buffer
tty_flip_buffer_push
tty_insert_flip_string_fixed_flag
tty_register_ldisc
tty_termios_baud_rate
tty_termios_encode_baud_rate
tty_unregister_ldisc
typec_get_drvdata
typec_mux_get_drvdata
typec_mux_register
@@ -1921,30 +1853,25 @@
ufshcd_pltfrm_runtime_idle
ufshcd_pltfrm_runtime_resume
ufshcd_pltfrm_runtime_suspend
ufshcd_pltfrm_shutdown
ufshcd_pltfrm_suspend
ufshcd_remove
ufshcd_shutdown
ufshcd_uic_hibern8_exit
unlock_page
unmap_mapping_range
unpin_user_pages
unregister_blkdev
__unregister_chrdev
unregister_chrdev_region
unregister_die_notifier
unregister_inetaddr_notifier
unregister_kprobe
unregister_module_notifier
unregister_netdev
unregister_netdevice_notifier
unregister_netdevice_queue
unregister_oom_notifier
unregister_pernet_subsys
unregister_pm_notifier
unregister_reboot_notifier
unregister_rpmsg_driver
unregister_shrinker
unregister_syscore_ops
unregister_virtio_device
unregister_virtio_driver
up
@@ -1952,14 +1879,18 @@
update_rq_clock
up_read
up_write
usb_add_config
usb_add_function
usb_add_gadget_udc
usb_add_hcd
usb_composite_probe
usb_composite_unregister
usb_copy_descriptors
usb_create_hcd
usb_create_shared_hcd
usb_debug_root
usb_del_gadget_udc
usb_deregister
usb_disabled
usb_ep_alloc_request
usb_ep_autoconfig
@@ -1972,17 +1903,53 @@
usb_ep_set_maxpacket_limit
usb_function_register
usb_function_unregister
usb_gadget_connect
usb_gadget_disconnect
usb_gadget_giveback_request
usb_gadget_map_request
usb_gadget_probe_driver
usb_gadget_set_selfpowered
usb_gadget_set_state
usb_gadget_unmap_request
usb_get_dr_mode
usb_get_function
usb_get_function_instance
usb_get_maximum_speed
usb_hcd_is_primary_hcd
usb_hcd_poll_rh_status
usb_interface_id
usbnet_change_mtu
usbnet_disconnect
usbnet_get_drvinfo
usbnet_get_endpoints
usbnet_get_link
usbnet_get_link_ksettings
usbnet_get_msglevel
usbnet_get_stats64
usbnet_link_change
usbnet_nway_reset
usbnet_open
usbnet_probe
usbnet_read_cmd
usbnet_read_cmd_nopm
usbnet_resume
usbnet_set_link_ksettings
usbnet_set_msglevel
usbnet_skb_return
usbnet_start_xmit
usbnet_stop
usbnet_suspend
usbnet_tx_timeout
usbnet_unlink_rx_urbs
usbnet_update_max_qlen
usbnet_write_cmd
usbnet_write_cmd_async
usbnet_write_cmd_nopm
usb_put_function
usb_put_function_instance
usb_put_hcd
usb_register_driver
usb_remove_function
usb_remove_hcd
usb_role_switch_get
usb_role_switch_get_drvdata
@@ -2112,7 +2079,6 @@
vmalloc_user
vmap
vm_event_states
vmf_insert_pfn_prot
vm_map_ram
vm_node_stat
vm_unmap_ram
@@ -2129,7 +2095,6 @@
wait_for_completion_interruptible
wait_for_completion_interruptible_timeout
wait_for_completion_killable
wait_for_completion_killable_timeout
wait_for_completion_timeout
wait_woken
__wake_up
@@ -2143,11 +2108,10 @@
__warn_printk
watchdog_init_timeout
watchdog_set_restart_priority
wireless_send_event
woken_wake_function
work_busy
work_on_cpu
ww_mutex_lock
ww_mutex_lock_interruptible
ww_mutex_unlock
xhci_add_endpoint
xhci_check_bandwidth
@@ -2157,19 +2121,158 @@
xhci_get_ep_ctx
xhci_init_driver
xhci_reset_bandwidth
# preserved by --additions-only
alloc_netdev_mqs
all_vm_events
__arch_clear_user
bio_add_pc_page
bio_reset
__bitmap_equal
__bitmap_or
blk_insert_cloned_request
blk_mq_sched_mark_restart_hctx
blk_rq_append_bio
cache_line_size
class_create_file_ns
class_remove_file_ns
clear_page
cpu_pm_register_notifier
cpu_pm_unregister_notifier
debugfs_create_u8
debug_locks_off
devfreq_add_device
devfreq_cooling_unregister
devfreq_register_opp_notifier
devfreq_unregister_opp_notifier
dev_get_by_name
devm_of_pwm_get
devm_pinctrl_put
devm_rc_allocate_device
devm_rc_register_device
dev_pm_opp_find_freq_exact
dev_pm_opp_put_regulators
dev_pm_opp_set_regulators
dma_buf_mmap
dma_fence_get_status
dma_fence_remove_callback
dma_sync_single_for_device
downgrade_write
down_read_trylock
ether_setup
eth_type_trans
gcd
genlmsg_put
genl_register_family
genl_unregister_family
get_freelist_nr_pages
get_user_pages_fast
gpiod_set_raw_value
hci_alloc_dev
hci_free_dev
hci_recv_frame
hci_register_dev
hci_unregister_dev
hex_dump_to_buffer
iomem_resource
irq_work_run
jiffies_64_to_clock_t
__kfifo_init
kobject_del
kstrtobool_from_user
ktime_get_raw
led_classdev_unregister
memdup_user
__mmdrop
module_put
netif_tx_stop_all_queues
netlink_kernel_release
__nla_parse
nla_put
nla_put_nohdr
n_tty_ioctl_helper
of_devfreq_cooling_register_power
of_root
param_ops_byte
param_ops_string
perf_num_counters
pin_user_pages_remote
rb_prev
rb_replace_node
register_inetaddr_notifier
register_netdevice
register_netdevice_notifier
__release_region
request_firmware_nowait
__request_region
rtnl_is_locked
rtnl_lock
rtnl_unlock
__sbitmap_queue_get
sdio_claim_host
sdio_claim_irq
sdio_disable_func
sdio_enable_func
sdio_f0_readb
sdio_f0_writeb
sdio_get_host_pm_caps
sdio_readb
sdio_readl
sdio_readsb
sdio_register_driver
sdio_release_host
sdio_release_irq
sdio_set_block_size
sdio_set_host_pm_flags
sdio_unregister_driver
sdio_writeb
sdio_writel
sdio_writesb
send_sig_info
shmem_file_setup
si_meminfo
skb_dequeue
skb_pull_rcsum
skb_queue_head
skb_queue_purge
skb_realloc_headroom
smp_call_function_single
snd_soc_component_test_bits
sprint_symbol_no_offset
strpbrk
strspn
syscore_resume
syscore_suspend
system_long_wq
thermal_zone_device_update
__traceiter_gpu_mem_total
trace_output_call
__tracepoint_android_vh_ufs_update_sdev
__tracepoint_gpu_mem_total
trace_print_array_seq
trace_print_flags_seq
try_module_get
tty_driver_flush_buffer
tty_register_ldisc
tty_unregister_ldisc
ufshcd_pltfrm_shutdown
unmap_mapping_range
unpin_user_page
unregister_inetaddr_notifier
unregister_netdevice_notifier
unregister_netdevice_queue
unregister_syscore_ops
v4l2_m2m_buf_copy_metadata
v4l2_m2m_buf_remove_by_buf
v4l2_m2m_register_media_controller
v4l2_m2m_request_queue
v4l2_m2m_unregister_media_controller
vmf_insert_pfn_prot
wait_for_completion_killable_timeout
wireless_send_event
ww_mutex_lock
zlib_deflate
zlib_deflateEnd
zlib_deflateInit2
zlib_deflateReset
zlib_deflate_workspacesize
# preserved by --additions-only
debugfs_create_u8
devm_of_pwm_get
led_classdev_unregister
pin_user_pages_remote
send_sig_info
syscore_resume
syscore_suspend
unpin_user_page
v4l2_m2m_buf_remove_by_buf

View File

@@ -24,6 +24,7 @@
alloc_netdev_mqs
__alloc_pages_nodemask
__alloc_percpu
__alloc_percpu_gfp
__alloc_skb
alloc_skb_with_frags
alloc_workqueue
@@ -34,6 +35,8 @@
android_debug_symbol
android_rvh_probe_register
anon_inode_getfile
arc4_crypt
arc4_setkey
__arch_clear_user
__arch_copy_from_user
__arch_copy_in_user
@@ -263,8 +266,11 @@
cpus_read_unlock
cpu_subsys
cpu_topology
crc32_be
crc32_le
crc8
crc8_populate_msb
crypto_aead_decrypt
crypto_aead_encrypt
crypto_aead_setauthsize
crypto_aead_setkey
@@ -285,6 +291,7 @@
crypto_enqueue_request
crypto_has_alg
crypto_init_queue
__crypto_memneq
crypto_register_aead
crypto_register_ahash
crypto_register_alg
@@ -292,7 +299,9 @@
crypto_register_rngs
crypto_register_scomp
crypto_register_skcipher
crypto_shash_digest
crypto_shash_final
crypto_shash_finup
crypto_shash_setkey
crypto_shash_update
crypto_skcipher_decrypt
@@ -305,6 +314,7 @@
crypto_unregister_rngs
crypto_unregister_scomp
crypto_unregister_skcipher
__crypto_xor
css_next_child
csum_ipv6_magic
csum_partial
@@ -335,6 +345,7 @@
debugfs_lookup
debugfs_print_regs32
debugfs_remove
debugfs_rename
dec_zone_page_state
default_llseek
deferred_free
@@ -345,6 +356,8 @@
desc_to_gpio
destroy_workqueue
dev_alloc_name
dev_change_net_namespace
dev_close
dev_coredumpv
_dev_crit
__dev_direct_xmit
@@ -352,6 +365,7 @@
_dev_emerg
_dev_err
dev_err_probe
dev_fetch_sw_netstats
devfreq_add_device
devfreq_add_governor
devfreq_cooling_unregister
@@ -391,6 +405,7 @@
device_property_read_u8_array
device_register
device_remove_file
device_rename
device_set_wakeup_capable
device_show_int
device_store_int
@@ -849,6 +864,7 @@
enable_percpu_irq
ether_setup
eth_mac_addr
ethtool_op_get_link
eth_type_trans
eventfd_ctx_fdget
eventfd_ctx_fileget
@@ -865,6 +881,7 @@
extcon_register_notifier
extcon_set_state_sync
extcon_unregister_notifier
failure_tracking
fasync_helper
__fdget
fd_install
@@ -915,6 +932,7 @@
generic_file_llseek
generic_handle_irq
generic_iommu_put_resv_regions
genlmsg_multicast_allns
genlmsg_put
genl_register_family
genl_unregister_family
@@ -937,6 +955,8 @@
get_each_object_track
__get_free_pages
get_governor_parent_kobj
get_net_ns_by_fd
get_net_ns_by_pid
get_option
get_page_owner_handle
get_pfnblock_flags_mask
@@ -1013,6 +1033,9 @@
hvc_kick
hvc_poll
hvc_remove
__hw_addr_init
__hw_addr_sync
__hw_addr_unsync
hwrng_register
hwrng_unregister
hwspin_lock_free
@@ -1061,6 +1084,7 @@
inc_node_page_state
inc_zone_page_state
in_egroup_p
inet_csk_get_port
inet_proto_csum_replace4
init_dummy_netdev
init_iova_domain
@@ -1210,6 +1234,8 @@
kernel_connect
kernel_getsockname
kernel_kobj
kernel_param_lock
kernel_param_unlock
kernel_power_off
kernel_recvmsg
kernel_restart
@@ -1219,6 +1245,9 @@
kernfs_put
kern_mount
kern_unmount
key_create_or_update
key_put
keyring_alloc
__kfifo_alloc
__kfifo_free
__kfifo_in
@@ -1301,6 +1330,7 @@
kthread_unpark
kthread_worker_fn
ktime_get
ktime_get_coarse_with_offset
ktime_get_mono_fast_ns
ktime_get_real_seconds
ktime_get_real_ts64
@@ -1416,8 +1446,11 @@
neigh_lookup
neigh_xmit
__netdev_alloc_skb
netdev_err
netdev_info
netdev_rx_handler_register
netdev_rx_handler_unregister
netdev_set_default_ethtool_ops
netdev_update_features
netif_carrier_off
netif_carrier_on
@@ -1426,6 +1459,7 @@
netif_napi_add
__netif_napi_del
netif_receive_skb
netif_receive_skb_core
netif_receive_skb_list
netif_rx
netif_rx_ni
@@ -1436,7 +1470,11 @@
netlink_capable
__netlink_kernel_create
netlink_kernel_release
netlink_register_notifier
netlink_unicast
netlink_unregister_notifier
net_ns_type_operations
net_ratelimit
__next_zones_zonelist
nla_find
nla_memcpy
@@ -1752,6 +1790,7 @@
power_supply_set_property
power_supply_unregister
power_supply_unreg_notifier
prandom_bytes
prandom_u32
preempt_schedule
preempt_schedule_notrace
@@ -1777,6 +1816,7 @@
put_device
put_disk
put_iova_domain
__put_net
__put_page
put_pid
put_sg_io_hdr
@@ -1884,6 +1924,7 @@
register_netdevice_notifier
register_netevent_notifier
register_oom_notifier
register_pernet_device
register_pm_notifier
register_reboot_notifier
register_restart_handler
@@ -1952,10 +1993,20 @@
return_address
revalidate_disk_size
rfkill_alloc
rfkill_blocked
rfkill_destroy
rfkill_init_sw_state
rfkill_pause_polling
rfkill_register
rfkill_resume_polling
rfkill_set_hw_state
rfkill_unregister
rhashtable_free_and_destroy
rhashtable_insert_slow
rhltable_init
__rht_bucket_nested
rht_bucket_nested
rht_bucket_nested_insert
rndis_deregister
rndis_free_response
rndis_get_next_response
@@ -1968,7 +2019,9 @@
rndis_signal_connect
rndis_uninit
root_task_group
round_jiffies
round_jiffies_relative
round_jiffies_up
rpmsg_get_signals
rpmsg_poll
rpmsg_register_device
@@ -2122,8 +2175,11 @@
skb_add_rx_frag
skb_append_pagefrags
skb_checksum
skb_checksum_help
skb_clone
skb_clone_sk
skb_coalesce_rx_frag
skb_complete_wifi_ack
skb_copy
skb_copy_bits
skb_copy_datagram_iter
@@ -2214,6 +2270,7 @@
soc_device_register
soc_device_unregister
sock_alloc_send_skb
__sock_create
sock_create_kern
sock_gettstamp
sock_init_data
@@ -2292,6 +2349,7 @@
strscpy
strsep
strstr
__sw_hweight16
__sw_hweight32
__sw_hweight64
__sw_hweight8
@@ -2468,6 +2526,7 @@
__traceiter_android_vh_show_suspend_epoch_val
__traceiter_android_vh_timer_calc_index
__traceiter_android_vh_ufs_check_int_errors
__traceiter_android_vh_ufs_clock_scaling
__traceiter_android_vh_ufs_compl_command
__traceiter_android_vh_ufs_fill_prdt
__traceiter_android_vh_ufs_prepare_command
@@ -2580,6 +2639,7 @@
__tracepoint_android_vh_show_suspend_epoch_val
__tracepoint_android_vh_timer_calc_index
__tracepoint_android_vh_ufs_check_int_errors
__tracepoint_android_vh_ufs_clock_scaling
__tracepoint_android_vh_ufs_compl_command
__tracepoint_android_vh_ufs_fill_prdt
__tracepoint_android_vh_ufs_prepare_command
@@ -2700,6 +2760,7 @@
unregister_netdevice_queue
unregister_netevent_notifier
unregister_oom_notifier
unregister_pernet_device
unregister_pm_notifier
unregister_reboot_notifier
unregister_restart_handler
@@ -2844,6 +2905,7 @@
vchan_init
vchan_tx_desc_free
vchan_tx_submit
verify_pkcs7_signature
vfree
video_devdata
video_device_alloc
@@ -2888,6 +2950,7 @@
wakeup_source_register
wakeup_source_unregister
__warn_printk
wireless_nlevent_flush
wireless_send_event
woken_wake_function
work_busy

View File

@@ -41,7 +41,9 @@
available_idle_cpu
bdget_disk
bdput
bio_add_pc_page
bio_endio
bio_reset
bitmap_allocate_region
__bitmap_clear
bitmap_find_next_zero_area_off
@@ -56,6 +58,7 @@
blk_execute_rq_nowait
blk_get_request
blk_mq_rq_cpu
blk_mq_sched_mark_restart_hctx
blk_put_request
blk_queue_flag_clear
blk_queue_flag_set
@@ -65,6 +68,7 @@
blk_queue_max_discard_sectors
blk_queue_max_write_zeroes_sectors
blk_queue_physical_block_size
blk_rq_append_bio
blk_rq_map_kern
blk_rq_map_user
blk_rq_map_user_iov
@@ -1399,6 +1403,7 @@
rtc_update_irq
rtc_valid_tm
runqueues
__sbitmap_queue_get
sched_clock
sched_feat_keys
sched_feat_names
@@ -1701,6 +1706,7 @@
__traceiter_android_vh_ufs_check_int_errors
__traceiter_android_vh_ufs_compl_command
__traceiter_android_vh_ufs_send_command
__traceiter_android_vh_ufs_update_sdev
__traceiter_binder_transaction_received
__traceiter_cpu_frequency_limits
__traceiter_cpu_idle
@@ -1771,6 +1777,7 @@
__tracepoint_android_vh_ufs_check_int_errors
__tracepoint_android_vh_ufs_compl_command
__tracepoint_android_vh_ufs_send_command
__tracepoint_android_vh_ufs_update_sdev
__tracepoint_binder_transaction_received
__tracepoint_cpu_frequency_limits
__tracepoint_cpu_idle

View File

@@ -207,6 +207,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_send_uic_command);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_send_tm_command);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_check_int_errors);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_update_sdev);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_clock_scaling);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_wake_up_sync);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_wake_flags);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_uclamp_eff_get);
@@ -244,9 +245,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_module_permit_after_init);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_util_est_update);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_meminfo_proc_show);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_mm);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_unmapped_area_from_anti_fragment_pool);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_from_fragment_pool);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exclude_reserved_zone);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_unmapped_area_include_reserved_zone);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_include_reserved_zone);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_slowpath);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_mem);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_print_slabinfo_header);

View File

@@ -212,6 +212,9 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
* broadcast must be assigned after the vendor hook.
*/
trace_android_vh_cpu_idle_enter(&index, dev);
if (index < 0)
return index;
target_state = &drv->states[index];
broadcast = !!(target_state->flags & CPUIDLE_FLAG_TIMER_STOP);
@@ -428,7 +431,7 @@ void cpuidle_uninstall_idle_handler(void)
{
if (enabled_devices) {
initialized = 0;
wake_up_all_idle_cpus();
wake_up_all_online_idle_cpus();
}
/*

View File

@@ -50,20 +50,6 @@ struct redist_region {
bool single_redist;
};
struct gic_chip_data {
struct fwnode_handle *fwnode;
void __iomem *dist_base;
struct redist_region *redist_regions;
struct rdists rdists;
struct irq_domain *domain;
u64 redist_stride;
u32 nr_redist_regions;
u64 flags;
bool has_rss;
unsigned int ppi_nr;
struct partition_desc **ppi_descs;
};
static struct gic_chip_data gic_data __read_mostly;
static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key);

View File

@@ -1288,6 +1288,8 @@ static int ufshcd_devfreq_target(struct device *dev,
struct list_head *clk_list = &hba->clk_list_head;
struct ufs_clk_info *clki;
unsigned long irq_flags;
bool force_out = false;
bool force_scaling = false;
if (!ufshcd_is_clkscaling_supported(hba))
return -EINVAL;
@@ -1313,8 +1315,11 @@ static int ufshcd_devfreq_target(struct device *dev,
scale_up = (*freq == clki->max_freq) ? true : false;
if (!scale_up)
*freq = clki->min_freq;
trace_android_vh_ufs_clock_scaling(hba, &force_out, &force_scaling, &scale_up);
/* Update the frequency */
if (!ufshcd_is_devfreq_scaling_required(hba, scale_up)) {
if (force_out || (!force_scaling && !ufshcd_is_devfreq_scaling_required(hba, scale_up))) {
spin_unlock_irqrestore(hba->host->host_lock, irq_flags);
ret = 0;
goto out; /* no state change required */

View File

@@ -879,8 +879,6 @@ struct dwc3_hwparams {
/* HWPARAMS0 */
#define DWC3_MODE(n) ((n) & 0x7)
#define DWC3_MDWIDTH(n) (((n) & 0xff00) >> 8)
/* HWPARAMS1 */
#define DWC3_NUM_INT(n) (((n) & (0x3f << 15)) >> 15)
@@ -1493,6 +1491,23 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type);
(!(_ip##_VERSIONTYPE_##_to) || \
dwc->version_type <= _ip##_VERSIONTYPE_##_to))
/**
* dwc3_mdwidth - get MDWIDTH value in bits
* @dwc: pointer to our context structure
*
* Return MDWIDTH configuration value in bits.
*/
static inline u32 dwc3_mdwidth(struct dwc3 *dwc)
{
u32 mdwidth;
mdwidth = DWC3_GHWPARAMS0_MDWIDTH(dwc->hwparams.hwparams0);
if (DWC3_IP_IS(DWC32))
mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);
return mdwidth;
}
bool dwc3_has_imod(struct dwc3 *dwc);
int dwc3_event_buffers_setup(struct dwc3 *dwc);

View File

@@ -638,16 +638,14 @@ static int dwc3_tx_fifo_size_show(struct seq_file *s, void *unused)
struct dwc3_ep *dep = s->private;
struct dwc3 *dwc = dep->dwc;
unsigned long flags;
int mdwidth;
u32 mdwidth;
u32 val;
spin_lock_irqsave(&dwc->lock, flags);
val = dwc3_core_fifo_space(dep, DWC3_TXFIFO);
/* Convert to bytes */
mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);
if (DWC3_IP_IS(DWC32))
mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);
mdwidth = dwc3_mdwidth(dwc);
val *= mdwidth;
val >>= 3;
@@ -662,16 +660,14 @@ static int dwc3_rx_fifo_size_show(struct seq_file *s, void *unused)
struct dwc3_ep *dep = s->private;
struct dwc3 *dwc = dep->dwc;
unsigned long flags;
int mdwidth;
u32 mdwidth;
u32 val;
spin_lock_irqsave(&dwc->lock, flags);
val = dwc3_core_fifo_space(dep, DWC3_RXFIFO);
/* Convert to bytes */
mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);
if (DWC3_IP_IS(DWC32))
mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);
mdwidth = dwc3_mdwidth(dwc);
val *= mdwidth;
val >>= 3;

View File

@@ -2367,9 +2367,7 @@ static void dwc3_gadget_setup_nump(struct dwc3 *dwc)
u32 reg;
ram2_depth = DWC3_GHWPARAMS7_RAM2_DEPTH(dwc->hwparams.hwparams7);
mdwidth = DWC3_GHWPARAMS0_MDWIDTH(dwc->hwparams.hwparams0);
if (DWC3_IP_IS(DWC32))
mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);
mdwidth = dwc3_mdwidth(dwc);
nump = ((ram2_depth * mdwidth / 8) - 24 - 16) / 1024;
nump = min_t(u32, nump, 16);
@@ -2632,12 +2630,10 @@ static int dwc3_gadget_init_control_endpoint(struct dwc3_ep *dep)
static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep)
{
struct dwc3 *dwc = dep->dwc;
int mdwidth;
u32 mdwidth;
int size;
mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);
if (DWC3_IP_IS(DWC32))
mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);
mdwidth = dwc3_mdwidth(dwc);
/* MDWIDTH is represented in bits, we need it in bytes */
mdwidth /= 8;
@@ -2679,12 +2675,10 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_ep *dep)
static int dwc3_gadget_init_out_endpoint(struct dwc3_ep *dep)
{
struct dwc3 *dwc = dep->dwc;
int mdwidth;
u32 mdwidth;
int size;
mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);
if (DWC3_IP_IS(DWC32))
mdwidth += DWC3_GHWPARAMS6_MDWIDTH(dwc->hwparams.hwparams6);
mdwidth = dwc3_mdwidth(dwc);
/* MDWIDTH is represented in bits, convert to bytes */
mdwidth /= 8;

View File

@@ -693,6 +693,20 @@ int its_init(struct fwnode_handle *handle, struct rdists *rdists,
struct irq_domain *domain);
int mbi_init(struct fwnode_handle *fwnode, struct irq_domain *parent);
struct gic_chip_data {
struct fwnode_handle *fwnode;
void __iomem *dist_base;
struct redist_region *redist_regions;
struct rdists rdists;
struct irq_domain *domain;
u64 redist_stride;
u32 nr_redist_regions;
u64 flags;
bool has_rss;
unsigned int ppi_nr;
struct partition_desc **ppi_descs;
};
static inline bool gic_enable_sre(void)
{
u32 val;

View File

@@ -127,6 +127,7 @@ int smp_call_function_any(const struct cpumask *mask,
void kick_all_cpus_sync(void);
void wake_up_all_idle_cpus(void);
void wake_up_all_online_idle_cpus(void);
/*
* Generic and arch helpers
@@ -182,6 +183,7 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func,
static inline void kick_all_cpus_sync(void) { }
static inline void wake_up_all_idle_cpus(void) { }
static inline void wake_up_all_online_idle_cpus(void) { }
#ifdef CONFIG_UP_LATE_INIT
extern void __init up_late_init(void);

View File

@@ -54,14 +54,14 @@ DECLARE_HOOK(android_vh_meminfo_proc_show,
DECLARE_HOOK(android_vh_exit_mm,
TP_PROTO(struct mm_struct *mm),
TP_ARGS(mm));
DECLARE_HOOK(android_vh_get_unmapped_area_from_anti_fragment_pool,
DECLARE_HOOK(android_vh_get_from_fragment_pool,
TP_PROTO(struct mm_struct *mm, struct vm_unmapped_area_info *info,
unsigned long *addr),
TP_ARGS(mm, info, addr));
DECLARE_HOOK(android_vh_exclude_reserved_zone,
TP_PROTO(struct mm_struct *mm, struct vm_unmapped_area_info *info),
TP_ARGS(mm, info));
DECLARE_HOOK(android_vh_get_unmapped_area_include_reserved_zone,
DECLARE_HOOK(android_vh_include_reserved_zone,
TP_PROTO(struct mm_struct *mm, struct vm_unmapped_area_info *info,
unsigned long *addr),
TP_ARGS(mm, info, addr));

View File

@@ -55,6 +55,9 @@ DECLARE_HOOK(android_vh_ufs_update_sdev,
TP_PROTO(struct scsi_device *sdev),
TP_ARGS(sdev));
DECLARE_HOOK(android_vh_ufs_clock_scaling,
TP_PROTO(struct ufs_hba *hba, bool *force_out, bool *force_scaling, bool *scale_up),
TP_ARGS(hba, force_out, force_scaling, scale_up));
#endif /* _TRACE_HOOK_UFSHCD_H */
/* This part must be outside protection */
#include <trace/define_trace.h>

View File

@@ -667,6 +667,9 @@ void swiotlb_tbl_sync_single(struct device *hwdev, phys_addr_t tlb_addr,
if (orig_addr == INVALID_PHYS_ADDR)
return;
orig_addr += (tlb_addr & (IO_TLB_SIZE - 1)) -
swiotlb_align_offset(hwdev, orig_addr);
switch (target) {
case SYNC_FOR_CPU:
if (likely(dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL))

View File

@@ -121,6 +121,8 @@
*/
#define MAX_THREADS FUTEX_TID_MASK
EXPORT_TRACEPOINT_SYMBOL_GPL(task_newtask);
/*
* Protected counters by write_lock_irq(&tasklist_lock)
*/

View File

@@ -967,6 +967,27 @@ void wake_up_all_idle_cpus(void)
}
EXPORT_SYMBOL_GPL(wake_up_all_idle_cpus);
/**
* wake_up_all_online_idle_cpus - break all online cpus out of idle
* wake_up_all_online_idle_cpus try to break all online cpus which is in idle
* state even including idle polling cpus, for non-idle cpus, we will do nothing
* for them.
*/
void wake_up_all_online_idle_cpus(void)
{
int cpu;
preempt_disable();
for_each_online_cpu(cpu) {
if (cpu == smp_processor_id())
continue;
wake_up_if_idle(cpu);
}
preempt_enable();
}
EXPORT_SYMBOL_GPL(wake_up_all_online_idle_cpus);
/**
* smp_call_on_cpu - Call a function on a specific cpu
*

View File

@@ -38,12 +38,8 @@ EXPORT_SYMBOL_GPL(debug_locks_silent);
*/
noinstr int debug_locks_off(void)
{
if (debug_locks && __debug_locks_off()) {
if (!debug_locks_silent) {
console_verbose();
return 1;
}
}
if (debug_locks && __debug_locks_off() && !debug_locks_silent)
return 1;
return 0;
}
EXPORT_SYMBOL_GPL(debug_locks_off);

View File

@@ -2101,7 +2101,7 @@ static unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
if (length < info->length)
return -ENOMEM;
trace_android_vh_get_unmapped_area_from_anti_fragment_pool(mm, info, &addr);
trace_android_vh_get_from_fragment_pool(mm, info, &addr);
if (addr)
return addr;
@@ -2324,7 +2324,7 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
addr = vm_unmapped_area(&info);
}
trace_android_vh_get_unmapped_area_include_reserved_zone(mm, &info, &addr);
trace_android_vh_include_reserved_zone(mm, &info, &addr);
return addr;
}