diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index a9023134675169b0570b06d9b808a4b4443ce72f..7b7146a9b480465460e360c21d5e4e43ddde124a 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 801a521613ad0e7959e30e5bb6993b60b0c7e9bf..e111874869ab308895dc3bb48c855061285cc7b9 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