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

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

Merge "arm64: use RET instruction for exiting the trampoline"

parents 06c058b2 509a7a81

arch/arm64/kernel/entry.S

+4 −1
Original line number Diff line number Diff line
@@ -947,6 +947,9 @@ __ni_sys_trace: 
	.if	\regsize == 64

	msr	tpidrro_el0, x30	// Restored in kernel_ventry

	.endif

	bl	2f

	b	.

2:

	tramp_map_kernel	x30

#ifdef CONFIG_RANDOMIZE_BASE

	adr	x30, tramp_vectors + PAGE_SIZE
@@ -959,7 +962,7 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 
	msr	vbar_el1, x30

	add	x30, x30, #(1b - tramp_vectors)

	isb

	br	x30

	ret

	.endm



	.macro tramp_exit, regsize = 64