From: Tianyi Liu <i.pear@outlook.com>
Date: Thu, 12 Oct 2023 13:19:41 +0000 (+0800)
Subject: arch/arm64: Fix dependency for `arm64_syscall_adapter`
X-Git-Tag: RELEASE-0.15.0~72
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=21b44eab4b0bc62e70e2b57962c2f23eda30c687;p=unikraft%2Funikraft.git

arch/arm64: Fix dependency for `arm64_syscall_adapter`

The `arm64_syscall_adapter` was introduced by #1009.

In order to forward binary syscalls,
it requires a dependency on `CONFIG_LIBSYSCALL_SHIM_HANDLER`,
and the current `CONFIG_LIBSYSCALL_SHIM` is not enough.

Signed-off-by: Tianyi Liu <i.pear@outlook.com>
Reviewed-by: Razvan Virtan <virtanrazvan@gmail.com>
Reviewed-by: Maria Sfiraiala <maria.sfiraiala@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #1132
---

diff --git a/plat/common/arm/traps_arm64.c b/plat/common/arm/traps_arm64.c
index 5ad6c9003..14faca563 100644
--- a/plat/common/arm/traps_arm64.c
+++ b/plat/common/arm/traps_arm64.c
@@ -222,7 +222,7 @@ void trap_el1_irq(struct __regs *regs)
 	gic->ops.handle_irq(regs);
 }
 
-#ifdef CONFIG_LIBSYSCALL_SHIM
+#ifdef CONFIG_LIBSYSCALL_SHIM_HANDLER
 
 extern void ukplat_syscall_handler(struct __regs *r);
 
@@ -236,4 +236,4 @@ static int arm64_syscall_adapter(void *data)
 
 UK_EVENT_HANDLER(UKARCH_TRAP_SYSCALL, arm64_syscall_adapter);
 
-#endif /* CONFIG_LIBSYSCALL_SHIM */
+#endif /* CONFIG_LIBSYSCALL_SHIM_HANDLER */