diff options
| author | Gunnar Beutner <gbeutner@serenityos.org> | 2021-06-28 20:59:35 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-06-28 22:29:28 +0200 |
| commit | 2a78bf85968ebff58b4d23be43fecdbe6178adb2 (patch) | |
| tree | 07daafb91a2e20fe77843c7aeb5726469cd29081 /Kernel/Syscalls/ioctl.cpp | |
| parent | b6435372cc91a9ce2c3f70a6d12c7f7869dfb2f0 (diff) | |
| download | serenity-2a78bf85968ebff58b4d23be43fecdbe6178adb2.zip | |
Kernel: Fix the return type for syscalls
The Process::Handler type has KResultOr<FlatPtr> as its return type.
Using a different return type with an equally-sized template parameter
sort of works but breaks once that condition is no longer true, e.g.
for KResultOr<int> on x86_64.
Ideally the syscall handlers would also take FlatPtrs as their args
so we can get rid of the reinterpret_cast for the function pointer
but I didn't quite feel like cleaning that up as well.
Diffstat (limited to 'Kernel/Syscalls/ioctl.cpp')
| -rw-r--r-- | Kernel/Syscalls/ioctl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Kernel/Syscalls/ioctl.cpp b/Kernel/Syscalls/ioctl.cpp index 98c5f655ca..8c2750b9f7 100644 --- a/Kernel/Syscalls/ioctl.cpp +++ b/Kernel/Syscalls/ioctl.cpp @@ -10,7 +10,7 @@ namespace Kernel { -KResultOr<int> Process::sys$ioctl(int fd, unsigned request, FlatPtr arg) +KResultOr<FlatPtr> Process::sys$ioctl(int fd, unsigned request, FlatPtr arg) { auto description = file_description(fd); if (!description) |