Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a7f587 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.61+ (874de1d9) into msm-5.4



* refs/heads/tmp-874de1d9:
  ANDROID: GKI: enable CONFIG_CPU_FREQ_STAT and more thermal configs
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: sched: add restrict vendor hook to modify load balance behavior
  ANDROID: GKI: Update abi_gki_aarch64_oneplus
  ANDROID: scs: use vmapped shadow stacks by default
  ANDROID: ABI: update allowed list for QCOM
  UPSTREAM: sched/fair/util_est: Implement faster ramp-up EWMA on utilization increases
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  ANDROID: kbuild: disable GCOV with CFI
  ANDROID: GKI: add built-in PCIE_DW_PLAT_EP
  ANDROID: PCI: dwc: export symbols for ep driver
  ANDROID: recordmcount: avoid STT_FILE as base for mcount offset relocation
  ANDROID: iommu: Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Quad lvl1 pgtable for MediaTek
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek
  BACKPORT: FROMLIST: iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap
  ANDROID: ABI: Update allowed list for QCOM
  ANDROID: modules: fix suspicious rcu usage

 Conflicts:
	kernel/sched/fair.c
	kernel/sched/features.h

Change-Id: I5d8dc058a0aca2b90ca702f18f71f663af9774fc
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 1eba9828 874de1d9
Loading
Loading
Loading
Loading
+1309 −799

File changed.

Preview size limit exceeded, changes collapsed.

+727 −617

File changed.

Preview size limit exceeded, changes collapsed.

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@
  amba_driver_register
  amba_driver_unregister
  anon_inode_getfd
  __arch_clear_user
  __arch_copy_from_user
  __arch_copy_in_user
  __arch_copy_to_user
@@ -165,6 +166,7 @@
  config_ep_by_speed
  config_group_init_type_name
  console_lock
  console_stop
  console_trylock
  console_unlock
  __const_udelay
@@ -1547,6 +1549,7 @@
  __tracepoint_android_vh_is_fpsimd_save
  __tracepoint_device_pm_callback_end
  __tracepoint_device_pm_callback_start
  __tracepoint_gpu_mem_total
  __tracepoint_pelt_cfs_tp
  tracepoint_probe_register
  __tracepoint_suspend_resume
@@ -1596,6 +1599,7 @@
  ufshcd_dme_get_attr
  ufshcd_dme_set_attr
  ufshcd_pltfrm_init
  ufshcd_query_descriptor_retry
  ufshcd_remove
  ufshcd_shutdown
  ufshcd_system_resume
+1401 −77

File changed.

Preview size limit exceeded, changes collapsed.

+3 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@
  cpufreq_freq_attr_scaling_boost_freqs
  cpufreq_generic_attr
  cpufreq_generic_frequency_table_verify
  cpufreq_get_policy
  cpufreq_quick_get_max
  cpufreq_register_driver
  cpufreq_register_notifier
@@ -957,6 +958,7 @@
  get_random_bytes
  get_random_u32
  __get_task_comm
  get_task_pid
  get_tree_single
  get_unmapped_area
  get_unused_fd_flags
@@ -1777,6 +1779,7 @@
  put_device
  put_disk
  __put_page
  put_pid
  __put_task_struct
  put_unused_fd
  put_vaddr_frames
Loading