Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

bca03f0410e3 Merge branch 'android11-5.4' into b11-lts
5c1738a8f0 ANDROID: GKI: update symbol list for exynosauto soc
9898521cef ANDROID: ABI: update allowed list for galaxy
0b4009b30f ANDROID: GKI: initial upload list for exynosauto soc
3364218040 ANDROID: ABI: Update allowed list for QCOM
dc2d5a0ace ANDROID: ABI: Update allowed list for QCOM
f889ae2a8c ANDROID: ABI: Update allowed list for QCOM
4e7a62687a ANDROID: modules: cfi cleanup for module load failure

Change-Id: I3f11ee4af62c4381019d2d694ecbc3870f534d64
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2020-11-14 11:31:52 +01:00
commit a4f80493f9
6 changed files with 2504 additions and 218 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -144,8 +144,11 @@
__spi_alloc_controller
__spi_register_driver
__spmi_driver_register
__srcu_read_lock
__srcu_read_unlock
__stack_chk_fail
__stack_chk_guard
__sw_hweight8
__sw_hweight32
__sw_hweight64
__sync_dirty_buffer
@ -177,6 +180,7 @@
__wake_up
__wake_up_locked
__warn_printk
__xa_alloc
_bcd2bin
_bin2bcd
_copy_from_iter_full
@ -441,6 +445,7 @@
cpufreq_table_index_unsorted
cpufreq_unregister_driver
cpufreq_unregister_notifier
cpufreq_update_policy
cpuhp_tasks_frozen
cpuidle_pause_and_lock
cpuidle_resume_and_unlock
@ -457,6 +462,8 @@
crypto_destroy_tfm
crypto_register_rngs
crypto_shash_digest
crypto_shash_final
crypto_shash_update
crypto_unregister_rngs
csum_partial
d_add
@ -575,6 +582,7 @@
devm_gpio_request_one
devm_gpiochip_add_data
devm_gpiod_get
devm_gpiod_get_index
devm_gpiod_get_optional
devm_iio_channel_get
devm_iio_device_alloc
@ -678,6 +686,7 @@
dma_fence_context_alloc
dma_fence_default_wait
dma_fence_enable_sw_signaling
dma_fence_free
dma_fence_get_status
dma_fence_init
dma_fence_release
@ -1079,6 +1088,7 @@
gpiod_direction_input
gpiod_direction_output
gpiod_direction_output_raw
gpiod_cansleep
gpiod_get_optional
gpiod_get_raw_value
gpiod_get_raw_value_cansleep
@ -1115,6 +1125,7 @@
hrtimer_try_to_cancel
hvc_alloc
hvc_kick
hvc_poll
hvc_remove
hwrng_register
hwrng_unregister
@ -1192,6 +1203,7 @@
in6_pton
init_dummy_netdev
init_net
init_srcu_struct
init_task
init_timer_key
init_uts_ns
@ -1336,6 +1348,7 @@
kernel_kobj
kernel_read
kernel_recvmsg
kernel_restart
kernel_sendmsg
kernel_setsockopt
kernel_write
@ -1376,6 +1389,7 @@
kstat
kstrdup
kstrdup_quotable
kstrdup_quotable_cmdline
kstrndup
kstrtobool
kstrtobool_from_user
@ -1812,6 +1826,7 @@
power_supply_unregister
preempt_schedule
preempt_schedule_notrace
prepare_to_wait
prepare_to_wait_event
print_hex_dump
printk
@ -1913,6 +1928,7 @@
regulator_enable
regulator_force_disable
regulator_get
regulator_get_current_limit
regulator_get_mode
regulator_get_optional
regulator_get_voltage
@ -1933,6 +1949,7 @@
regulatory_hint
release_firmware
release_sock
regmap_mmio_detach_clk
remap_pfn_range
remap_vmalloc_range
remove_proc_entry
@ -2113,6 +2130,7 @@
smp_call_function_single
smp_call_function_single_async
smp_call_on_cpu
smpboot_register_percpu_thread
smpboot_unregister_percpu_thread
snd_card_free
snd_card_new
@ -2321,6 +2339,7 @@
sync_filesystem
synchronize_irq
synchronize_rcu
synchronize_srcu
sys_tz
syscon_node_to_regmap
syscon_regmap_lookup_by_phandle
@ -2379,6 +2398,7 @@
trace_raw_output_prep
trace_seq_printf
tracepoint_probe_register
tracing_off
truncate_inode_pages
try_module_get
try_wait_for_completion

View file

@ -663,6 +663,7 @@
drm_connector_list_iter_end
drm_connector_list_iter_next
drm_connector_register
drm_connector_set_tile_property
drm_connector_unregister
drm_connector_update_edid_property
drm_crtc_cleanup
@ -781,9 +782,11 @@
drm_mode_copy
drm_mode_create
drm_mode_create_dp_colorspace_property
drm_mode_create_tile_group
drm_mode_debug_printmodeline
drm_mode_duplicate
drm_mode_equal
drm_mode_get_tile_group
drm_mode_object_find
drm_mode_object_get
drm_mode_object_put
@ -1196,6 +1199,8 @@
irq_set_chained_handler_and_data
irq_set_chip_and_handler_name
irq_set_chip_data
__irq_set_handler
irq_set_handler_data
irq_set_irqchip_state
irq_set_irq_type
irq_set_irq_wake
@ -1224,6 +1229,9 @@
kern_path
keyslot_manager_create
keyslot_manager_private
keyslot_manager_set_max_dun_bytes
keyslot_manager_reprogram_all_keys
keyslot_manager_destroy
__kfifo_in
__kfifo_out
kfree

View file

@ -8,6 +8,7 @@ ADDITIONAL_KMI_SYMBOL_LISTS="
android/abi_gki_aarch64_cuttlefish
android/abi_gki_aarch64_db845c
android/abi_gki_aarch64_exynos
android/abi_gki_aarch64_exynosauto
android/abi_gki_aarch64_galaxy
android/abi_gki_aarch64_goldfish
android/abi_gki_aarch64_hikey960

View file

@ -3995,6 +3995,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
mutex_unlock(&module_mutex);
ddebug_cleanup:
/* Clean up CFI for the module. */
cfi_cleanup(mod);
ftrace_release_mod(mod);
dynamic_debug_remove(mod, info->debug);
synchronize_rcu();