From e4fd51bc6f434c8a130c3637a392d7119f5c2c9e Mon Sep 17 00:00:00 2001 From: StanPlatinum Date: Tue, 9 Apr 2024 10:08:39 +0000 Subject: [PATCH] sigretrun --> sigreturn --- kernel/aster-nix/src/syscall/mod.rs | 4 ++-- kernel/aster-nix/src/syscall/rt_sigreturn.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/aster-nix/src/syscall/mod.rs b/kernel/aster-nix/src/syscall/mod.rs index a8624bb34..1c80dcbaf 100644 --- a/kernel/aster-nix/src/syscall/mod.rs +++ b/kernel/aster-nix/src/syscall/mod.rs @@ -249,7 +249,7 @@ define_syscall_nums!( SYS_BRK = 12, SYS_RT_SIGACTION = 13, SYS_RT_SIGPROCMASK = 14, - SYS_RT_SIGRETRUN = 15, + SYS_RT_SIGRETURN = 15, SYS_IOCTL = 16, SYS_PREAD64 = 17, SYS_WRITEV = 20, @@ -437,7 +437,7 @@ pub fn syscall_dispatch( SYS_BRK => syscall_handler!(1, sys_brk, args), SYS_RT_SIGACTION => syscall_handler!(4, sys_rt_sigaction, args), SYS_RT_SIGPROCMASK => syscall_handler!(4, sys_rt_sigprocmask, args), - SYS_RT_SIGRETRUN => syscall_handler!(0, sys_rt_sigreturn, context), + SYS_RT_SIGRETURN => syscall_handler!(0, sys_rt_sigreturn, context), SYS_IOCTL => syscall_handler!(3, sys_ioctl, args), SYS_PREAD64 => syscall_handler!(4, sys_pread64, args), SYS_WRITEV => syscall_handler!(3, sys_writev, args), diff --git a/kernel/aster-nix/src/syscall/rt_sigreturn.rs b/kernel/aster-nix/src/syscall/rt_sigreturn.rs index bb120dccd..9e62aa034 100644 --- a/kernel/aster-nix/src/syscall/rt_sigreturn.rs +++ b/kernel/aster-nix/src/syscall/rt_sigreturn.rs @@ -2,7 +2,7 @@ use aster_frame::cpu::UserContext; -use super::{SyscallReturn, SYS_RT_SIGRETRUN}; +use super::{SyscallReturn, SYS_RT_SIGRETURN}; use crate::{ log_syscall_entry, prelude::*, @@ -11,12 +11,12 @@ use crate::{ }; pub fn sys_rt_sigreturn(context: &mut UserContext) -> Result { - log_syscall_entry!(SYS_RT_SIGRETRUN); + log_syscall_entry!(SYS_RT_SIGRETURN); let current_thread = current_thread!(); let posix_thread = current_thread.as_posix_thread().unwrap(); let mut sig_context = posix_thread.sig_context().lock(); if (*sig_context).is_none() { - return_errno_with_message!(Errno::EINVAL, "sigretrun should not been called"); + return_errno_with_message!(Errno::EINVAL, "sigreturn should not been called"); } let sig_context_addr = sig_context.unwrap(); // FIXME: This assertion is not always true, if RESTORER flag is not presented.