From 74d3b202f110c22f0b707cb8f2c36fca5ef4bc1d Mon Sep 17 00:00:00 2001 From: Brian Gianforcaro Date: Tue, 4 Aug 2020 22:29:28 -0700 Subject: [PATCH] Kernel: Use Userspace for the waitid syscall --- Kernel/API/Syscall.h | 2 +- Kernel/Process.h | 2 +- Kernel/Syscalls/waitid.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/API/Syscall.h b/Kernel/API/Syscall.h index b332059686..ef8d5ced68 100644 --- a/Kernel/API/Syscall.h +++ b/Kernel/API/Syscall.h @@ -427,7 +427,7 @@ struct SC_unveil_params { struct SC_waitid_params { int idtype; int id; - struct siginfo* infop; + Userspace infop; int options; }; diff --git a/Kernel/Process.h b/Kernel/Process.h index cae0cd9b24..d262cf2a5f 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -222,7 +222,7 @@ public: int sys$kill(pid_t pid, int sig); [[noreturn]] void sys$exit(int status); int sys$sigreturn(RegisterState& registers); - pid_t sys$waitid(const Syscall::SC_waitid_params*); + pid_t sys$waitid(Userspace); void* sys$mmap(const Syscall::SC_mmap_params*); int sys$munmap(void*, size_t size); int sys$set_mmap_name(const Syscall::SC_set_mmap_name_params*); diff --git a/Kernel/Syscalls/waitid.cpp b/Kernel/Syscalls/waitid.cpp index dd55a75b32..2650680b5f 100644 --- a/Kernel/Syscalls/waitid.cpp +++ b/Kernel/Syscalls/waitid.cpp @@ -93,7 +93,7 @@ KResultOr Process::do_waitid(idtype_t idtype, int id, int options) } } -pid_t Process::sys$waitid(const Syscall::SC_waitid_params* user_params) +pid_t Process::sys$waitid(Userspace user_params) { REQUIRE_PROMISE(proc);