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

Commit 4c0b234b authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.60+ (22550de6) into msm-5.4 



* refs/heads/tmp-22550de6:
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  ANDROID: tty: fix tty name overflow
  Revert "tracing: Move pipe reference to trace array instead of current_tracer"
  Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
  ANDROID: arm64: add __va_function
  ANDROID: ABI: fix ABI breakage
  ANDROID: sched: add vendor hook for correcting cpu capacity
  ANDROID: Revert: Merge 5.4.60 into android11-5.4
  ANDROID: sched: Use normal vendor hook in scheduler tick
  ANDROID: Add vendor hooks to the scheduler

Conflicts:
	drivers/base/arch_topology.c
	kernel/sched/core.c
	kernel/sched/rt.c

Change-Id: Id8e3bf41c77302eb907891b38ff8b7e7d4c586f4
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 125c29ef 22550de6

android/abi_gki_aarch64.xml

+4975 −4716

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_8ae87ad4df.xml

+319 −512

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_exynos

+17 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
  cpu_up

  crypto_alloc_shash

  crypto_destroy_tfm

  crypto_shash_digest

  crypto_shash_final

  crypto_shash_update

  _ctype
@@ -182,6 +183,7 @@ 
  _dev_err

  devfreq_add_device

  devfreq_add_governor

  devfreq_get_devfreq_by_phandle

  devfreq_recommended_opp

  devfreq_register_opp_notifier

  devfreq_remove_device
@@ -227,6 +229,7 @@ 
  devm_clk_get

  devm_clk_get_optional

  devm_clk_put

  devm_devfreq_register_notifier

  devm_extcon_dev_allocate

  devm_extcon_dev_register

  devm_extcon_dev_unregister
@@ -305,6 +308,7 @@ 
  dma_buf_begin_cpu_access

  dma_buf_detach

  dma_buf_end_cpu_access

  dma_buf_end_cpu_access_partial

  dma_buf_export

  dma_buf_fd

  dma_buf_get
@@ -317,6 +321,11 @@ 
  dma_buf_unmap_attachment

  dma_buf_vmap

  dma_buf_vunmap

  dma_common_get_sgtable

  dma_common_mmap

  dma_direct_alloc

  dma_direct_free

  dma_direct_get_required_mask

  dma_direct_map_page

  dma_direct_map_resource

  dma_direct_map_sg
@@ -357,6 +366,7 @@ 
  down_read

  down_trylock

  down_write

  d_path

  driver_find

  driver_find_device

  driver_register
@@ -594,6 +604,7 @@ 
  jiffies

  jiffies_64

  jiffies_64_to_clock_t

  jiffies64_to_msecs

  jiffies_to_msecs

  jiffies_to_usecs

  kasprintf
@@ -639,6 +650,7 @@ 
  kstrtou16

  kstrtou8

  kstrtouint

  kstrtouint_from_user

  kstrtoull

  kstrtoull_from_user

  kthread_bind
@@ -658,6 +670,7 @@ 
  kthread_worker_fn

  ktime_get

  ktime_get_mono_fast_ns

  ktime_get_raw

  ktime_get_raw_ts64

  ktime_get_real_ts64

  ktime_get_ts64
@@ -672,6 +685,7 @@ 
  llist_add_batch

  __lock_buffer

  loops_per_jiffy

  map_vm_area

  match_string

  media_create_intf_link

  media_create_pad_link
@@ -725,6 +739,7 @@ 
  mutex_lock_interruptible

  mutex_trylock

  mutex_unlock

  names_cachep

  __napi_alloc_skb

  napi_complete_done

  napi_disable
@@ -1313,6 +1328,7 @@ 
  trace_event_reg

  trace_handle_return

  trace_output_call

  __tracepoint_android_vh_is_fpsimd_save

  __tracepoint_device_pm_callback_end

  __tracepoint_device_pm_callback_start

  __tracepoint_pelt_cfs_tp
@@ -1367,6 +1383,7 @@ 
  ufshcd_shutdown

  ufshcd_system_resume

  ufshcd_system_suspend

  ufshcd_wb_ctrl

  unmap_mapping_range

  __unregister_chrdev

  unregister_chrdev_region

arch/arm64/include/asm/kvm_asm.h

+2 −2
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ 
/* Translate a kernel address of @sym into its equivalent linear mapping */

#define kvm_ksym_ref(sym)						\

	({								\

		void *val = &sym;					\

		void *val = __va_function(sym);				\

		if (!is_kernel_in_hyp_mode())				\

			val = lm_alias(&sym);				\

			val = lm_alias(val);				\

		val;							\

	 })

arch/arm64/include/asm/memory.h

+5 −3
Original line number Diff line number Diff line
@@ -321,13 +321,15 @@ static inline void *phys_to_virt(phys_addr_t x) 
 * virtual address. Therefore, use inline assembly to ensure we are

 * always taking the address of the actual function.

 */

#define __pa_function(x) ({						\

	unsigned long addr;						\

#define __va_function(x) ({						\

	void *addr;							\

	asm("adrp %0, " __stringify(x) "\n\t"				\

	    "add  %0, %0, :lo12:" __stringify(x) : "=r" (addr));	\

	__pa_symbol(addr);						\

	addr;								\

})



#define __pa_function(x) 	__pa_symbol(__va_function(x))



/*

 *  virt_to_page(x)	convert a _valid_ virtual address to struct page *

 *  virt_addr_valid(x)	indicates whether a virtual address is valid