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

Commit 215e9989 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Sync up with the latest changes in 'android11-5.4'

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia6cb40b5c15dd009b4cd8d3a9db48e8b9af5b9d0
parents 3a3ba4b7 bb168ca1

android/abi_gki_aarch64.xml

+1786 −888

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+2 −0
Original line number Diff line number Diff line
@@ -1289,6 +1289,8 @@ 
  kvmalloc_node

  kzfree

  led_blink_set

  led_classdev_flash_register_ext

  led_classdev_flash_unregister

  led_classdev_register_ext

  led_classdev_unregister

  led_get_default_pattern

android/abi_gki_aarch64_workarounds

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[abi_whitelist]

  # b/167230325

  ehci_handshake

arch/x86/power/cpu.c

+13 −0
Original line number Diff line number Diff line
@@ -268,6 +268,19 @@ static void notrace __restore_processor_state(struct saved_context *ctxt) 
/* Needed by apm.c */

void notrace restore_processor_state(void)

{

#ifdef __clang__

	// The following code snippet is copied from __restore_processor_state.

	// Its purpose is to prepare GS segment before the function is called.

	// Since the function is compiled with SCS on, it will use GS at its

	// entry.

	// TODO: Hack to be removed later when compiler bug is fixed.

#ifdef CONFIG_X86_64

	wrmsrl(MSR_GS_BASE, saved_context.kernelmode_gs_base);

#else

	loadsegment(fs, __KERNEL_PERCPU);

	loadsegment(gs, __KERNEL_STACK_CANARY);

#endif

#endif

	__restore_processor_state(&saved_context);

}

#ifdef CONFIG_X86_32

build.config.gki.aarch64

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ android/abi_gki_aarch64_qcom 
android/abi_gki_aarch64_sunxi

android/abi_gki_aarch64_unisoc

android/abi_gki_aarch64_vivo

android/abi_gki_aarch64_workarounds

"

TRIM_NONLISTED_KMI=1

KMI_SYMBOL_LIST_ADD_ONLY=1