Skip to content

Commit 1885476

Browse files
committed
fix syscall script calls from outside so3 folder
1 parent ccaa83e commit 1885476

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

so3/Kbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
syscall-files = include/generated/syscall_table.h.in
88
syscall-files += include/generated/syscall_number.h
9-
syscall-script = scripts/syscall_gen.sh
10-
syscall-src = syscall.tbl arch/$(SRCARCH)/syscall.h.in
9+
syscall-script = $(srctree)/scripts/syscall_gen.sh
10+
syscall-src = $(srctree)/syscall.tbl $(srctree)/arch/$(SRCARCH)/syscall.h.in
1111

1212
quiet_cmd_syscall_gen = GEN $@
1313
cmd_syscall_gen = $(syscall-script) $(syscall-src) $(syscall-files)

so3/arch/arm64/exception.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,13 +564,15 @@ el01_sync_handler:
564564
mov x0, sp
565565
bl trap_handle
566566

567+
#ifdef CONFIG_IPC_SIGNAL
567568
// Check if sigreturn has been called. In this case, we
568569
// clean the stack frame which has been used to manage the user handler.
569570
cmp x8, #SYSCALL_rt_sigreturn
570571
bne ret_from_fork
571572

572573
// Reset the stack frame by removing the one issued from sigreturn
573574
add sp, sp, #S_FRAME_SIZE
575+
#endif
574576

575577
// Entry point for new user threads
576578
ret_from_fork:

so3/kernel/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void *rest_init(void *dummy)
7878

7979
kernel_thread(app_thread_main, "main_kernel", NULL, 0);
8080

81-
thread_exit(NULL);
81+
thread_exit(0);
8282

8383
#elif defined(CONFIG_PROC_ENV)
8484

0 commit comments

Comments
 (0)