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

Commit fcbdaa6a authored by James Morse's avatar James Morse Committed by Greg Kroah-Hartman
Browse files

fixup for "arm64 entry: Add macro for reading symbol address from the trampoline" 



__sdei_asm_trampoline_next_handler shouldn't have its own name as the
tramp_data_read_var takes the symbol name, and generates the name for
the value in the data page if CONFIG_RANDOMIZE_BASE is clear.

This means when CONFIG_RANDOMIZE_BASE is clear, this code won't compile
as __sdei_asm_trampoline_next_handler doesn't exist.

Use the proper name, and let the macro do its thing.

Reported-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8bc0718

arch/arm64/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ __entry_tramp_data_start: 
__entry_tramp_data_vectors:

	.quad	vectors

#ifdef CONFIG_ARM_SDE_INTERFACE

__entry_tramp_data___sdei_asm_trampoline_next_handler:

__entry_tramp_data___sdei_asm_handler:

	.quad	__sdei_asm_handler

#endif /* CONFIG_ARM_SDE_INTERFACE */

__entry_tramp_data_this_cpu_vector:
@@ -1331,7 +1331,7 @@ ENTRY(__sdei_asm_entry_trampoline) 
	 */

1:	str	x4, [x1, #(SDEI_EVENT_INTREGS + S_ORIG_ADDR_LIMIT)]



	tramp_data_read_var     x4, __sdei_asm_trampoline_next_handler

	tramp_data_read_var     x4, __sdei_asm_handler

	br	x4

ENDPROC(__sdei_asm_entry_trampoline)

NOKPROBE(__sdei_asm_entry_trampoline)