Merge PR 12454

This commit is contained in:
yuzubot
2023-12-29 00:56:53 +00:00
parent 12178c694a
commit 0b0f4c0586
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);