Messages in this thread | | | Date | Tue, 17 Mar 2020 22:32:14 +0000 | From | Will Deacon <> | Subject | Re: [PATCH 2/3] arm64/sdei: gather trampolines' .rodata |
| |
On Mon, Mar 16, 2020 at 02:40:45PM +0200, Rémi Denis-Courmont wrote: > From: Rémi Denis-Courmont <remi.denis.courmont@huawei.com> > > This gathers the two bits of data together for clarity. > > Signed-off-by: Rémi Denis-Courmont <remi.denis.courmont@huawei.com> > --- > arch/arm64/kernel/entry.S | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index 24f828739696..af17fcb4aaea 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -859,6 +859,11 @@ SYM_CODE_END(tramp_exit_compat) > #ifdef CONFIG_RANDOMIZE_BASE > .pushsection ".rodata", "a" > .align PAGE_SHIFT > +#ifdef CONFIG_ARM_SDE_INTERFACE > +SYM_DATA_START(__sdei_asm_trampoline_next_handler) > + .quad __sdei_asm_handler > +SYM_DATA_END(__sdei_asm_trampoline_next_handler) > +#endif > SYM_DATA_START(__entry_tramp_data_start) > .quad vectors > SYM_DATA_END(__entry_tramp_data_start) > @@ -980,13 +985,6 @@ SYM_CODE_END(__sdei_asm_exit_trampoline) > NOKPROBE(__sdei_asm_exit_trampoline) > .ltorg > .popsection // .entry.tramp.text > -#ifdef CONFIG_RANDOMIZE_BASE > -.pushsection ".rodata", "a" > -SYM_DATA_START(__sdei_asm_trampoline_next_handler) > - .quad __sdei_asm_handler > -SYM_DATA_END(__sdei_asm_trampoline_next_handler) > -.popsection // .rodata > -#endif /* CONFIG_RANDOMIZE_BASE */ > #endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */
Acked-by: Will Deacon <will@kernel.org>
Will
| |