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

Commit 9731a9e1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID: arm64: kaslr: fixup Falkor workaround for 4.9"

parents b018c519 735703da

arch/arm64/include/asm/cpucaps.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -36,8 +36,7 @@ 
#define ARM64_MISMATCHED_CACHE_LINE_SIZE	15

#define ARM64_MISMATCHED_CACHE_LINE_SIZE	15





#define ARM64_UNMAP_KERNEL_AT_EL0		16

#define ARM64_UNMAP_KERNEL_AT_EL0		16

#define	ARM64_WORKAROUND_QCOM_FALKOR_E1003	17





#define ARM64_NCAPS				18

#define ARM64_NCAPS				17





#endif /* __ASM_CPUCAPS_H */
 
#endif /* __ASM_CPUCAPS_H */

arch/arm64/kernel/entry.S

+3 −1
Original line number Original line Diff line number Diff line
@@ -953,7 +953,9 @@ __ni_sys_trace: 
	tramp_map_kernel	x30

	tramp_map_kernel	x30

#ifdef CONFIG_RANDOMIZE_BASE

#ifdef CONFIG_RANDOMIZE_BASE

	adr	x30, tramp_vectors + PAGE_SIZE

	adr	x30, tramp_vectors + PAGE_SIZE

alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003

#ifndef CONFIG_ARCH_MSM8996

	isb

#endif

	ldr	x30, [x30]

	ldr	x30, [x30]

#else

#else

	ldr	x30, =vectors

	ldr	x30, =vectors