From b328e524c85af8e72a34ae8fbef9bdc363d6f84a Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Mon, 8 Jan 2018 12:22:41 -0800 Subject: [PATCH] ANDROID: arm64: kaslr: fixup Falkor workaround for 4.9 android-4.9 port of upstream commit 6c27c4082f4f70b9f41df4d0adf51128b40351df "arm64: kaslr: Put kernel vectors address in separate data page" failed to fixup code that does not omcpile when CONFIG_RANDOMIZE_BASE=y. Port fixup for earlier kernels from ghackmann@google.com to android-4.9: - replace ARM64_WORKAROUND_QCOM_FALKOR_E1003 alternative with compile-time CONFIG_ARCH_MSM8996 check] Change-Id: Idc4bb255db830029093ea0d948a9e5066e2c13f8 Signed-off-by: Greg Hackmann Signed-off-by: Todd Poynor --- arch/arm64/kernel/entry.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index c1ff0999045e..3448a6250ac2 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -954,7 +954,9 @@ __ni_sys_trace: tramp_map_kernel x30 #ifdef CONFIG_RANDOMIZE_BASE adr x30, tramp_vectors + PAGE_SIZE -alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 +#ifndef CONFIG_ARCH_MSM8996 + isb +#endif ldr x30, [x30] #else ldr x30, =vectors