hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/IBV2E4 -------------------------------- When ACTLR_XCALL_XINT not set, the "el0t_64_xcall" and "el0t_64_xint" will not be defind, the following build problem occurs. Define el0t_64_xcall and el0t_64_xint unconditionally to fix it because the vectors_xcall_xint will be used in alternative_if/else code and must be defined unconditionally. aarch64-linux-gnu-ld: arch/arm64/kernel/entry.o: in function `vectors_xcall_xint': ./arch/arm64/kernel/entry.S:596: undefined reference to `el0t_64_xcall' aarch64-linux-gnu-ld: ./arch/arm64/kernel/entry.S:596: undefined reference to `el0t_64_xcall' aarch64-linux-gnu-ld: ./arch/arm64/kernel/entry.S:597: undefined reference to `el0t_64_xint' Fixes: 7f2e02718bba ("arm64: entry: Support hardware xcall and xint") Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- arch/arm64/kernel/entry-common.c | 2 -- arch/arm64/kernel/entry.S | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c index a90231346751..7b7146a9b480 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -1051,7 +1051,6 @@ UNHANDLED(el0t, 32, fiq) UNHANDLED(el0t, 32, error) #endif /* CONFIG_AARCH32_EL0 */ -#ifdef CONFIG_ACTLR_XCALL_XINT asmlinkage void noinstr el0t_64_xcall_handler(struct pt_regs *regs) { el0_svc(regs); @@ -1060,7 +1059,6 @@ asmlinkage void noinstr el0t_64_xint_handler(struct pt_regs *regs) { el0_interrupt(regs, ISR_EL1_IS, handle_arch_irq, handle_arch_nmi_irq); } -#endif #ifdef CONFIG_VMAP_STACK asmlinkage void noinstr __noreturn handle_bad_stack(struct pt_regs *regs) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 801a521613ad..e111874869ab 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -788,10 +788,8 @@ SYM_CODE_END(el\el\ht\()_\regsize\()_\label) entry_handler 0, t, 64, fiq entry_handler 0, t, 64, error -#ifdef CONFIG_ACTLR_XCALL_XINT entry_handler 0, t, 64, xcall entry_handler 0, t, 64, xint -#endif entry_handler 0, t, 32, sync entry_handler 0, t, 32, irq entry_handler 0, t, 32, fiq -- 2.34.1