diff options
| author | bunnei <[email protected]> | 2021-04-10 00:02:52 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-04-10 00:02:52 -0700 |
| commit | b04877dd952d7da11647f16626952d7325e4e900 (patch) | |
| tree | d097ebea3b24a2c815015c17e6c5fd89c69ce045 /src/core/hle/kernel/k_scheduler.h | |
| parent | 31c80b8c6faa7681e7b16a4052403281c7f2b9cd (diff) | |
| parent | 10d6e9f32bcc102d2fb12ba3e489c9a03d7f220f (diff) | |
| download | yuzu-mainline-b04877dd952d7da11647f16626952d7325e4e900.tar.gz yuzu-mainline-b04877dd952d7da11647f16626952d7325e4e900.zip | |
Merge pull request #6099 from bunnei/derive-mem
Kernel Rework: Derive memory regions from board layout.
Diffstat (limited to 'src/core/hle/kernel/k_scheduler.h')
| -rw-r--r-- | src/core/hle/kernel/k_scheduler.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index 70d6bfcee..8e32865aa 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h @@ -2,19 +2,16 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -// This file references various implementation details from Atmosphere, an open-source firmware for -// the Nintendo Switch. Copyright 2018-2020 Atmosphere-NX. - #pragma once #include <atomic> #include "common/common_types.h" -#include "common/spin_lock.h" #include "core/hle/kernel/global_scheduler_context.h" #include "core/hle/kernel/k_priority_queue.h" #include "core/hle/kernel/k_scheduler_lock.h" #include "core/hle/kernel/k_scoped_lock.h" +#include "core/hle/kernel/k_spin_lock.h" namespace Common { class Fiber; @@ -195,7 +192,7 @@ private: u64 last_context_switch_time{}; const s32 core_id; - Common::SpinLock guard{}; + KSpinLock guard{}; }; class [[nodiscard]] KScopedSchedulerLock : KScopedLock<GlobalSchedulerContext::LockType> { |