Merge PR 12454

This commit is contained in:
yuzubot
2024-01-01 00:57:33 +00:00
parent 09bfc852dc
commit 79cfd1f97e
15 changed files with 101 additions and 110 deletions

View File

@@ -238,7 +238,7 @@ struct KernelCore::Impl {
void InitializePreemption(KernelCore& kernel) {
preemption_event = Core::Timing::CreateEvent(
"PreemptionCallback",
[this, &kernel](std::uintptr_t, s64 time,
[this, &kernel](s64 time,
std::chrono::nanoseconds) -> std::optional<std::chrono::nanoseconds> {
{
KScopedSchedulerLock lock(kernel);