diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c
index 941929be..cdf39c93 100644
--- a/executer/user/mcexec.c
+++ b/executer/user/mcexec.c
@@ -825,7 +825,7 @@ int main(int argc, char **argv)
 
 
 void do_syscall_return(int fd, int cpu,
-                       int ret, int n, unsigned long src, unsigned long dest,
+                       long ret, int n, unsigned long src, unsigned long dest,
                        unsigned long sz)
 {
 	struct syscall_ret_desc desc;
diff --git a/kernel/include/syscall.h b/kernel/include/syscall.h
index be4c0099..68c26853 100644
--- a/kernel/include/syscall.h
+++ b/kernel/include/syscall.h
@@ -207,7 +207,7 @@ struct syscall_params {
 
 #define SYSCALL_FOOTER return do_syscall(&request, ctx, ihk_mc_get_processor_id())
 
-extern int do_syscall(struct syscall_request *req, ihk_mc_user_context_t *ctx, int cpu);
+extern long do_syscall(struct syscall_request *req, ihk_mc_user_context_t *ctx, int cpu);
 extern int obtain_clone_cpuid();
 extern long syscall_generic_forwarding(int n, ihk_mc_user_context_t *ctx);
 
diff --git a/kernel/syscall.c b/kernel/syscall.c
index 5a4dfb74..8778f849 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -151,7 +151,7 @@ static void send_syscall(struct syscall_request *req, int cpu)
 }
 
 
-int do_syscall(struct syscall_request *req, ihk_mc_user_context_t *ctx, int cpu)
+long do_syscall(struct syscall_request *req, ihk_mc_user_context_t *ctx, int cpu)
 {
 	struct syscall_response *res;
 	struct syscall_request req2 IHK_DMA_ALIGN;