RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 21:17:45 +00:00
Code Issues Activity Actions

Kernel: Move Singleton class to AK

Browse source
This commit is contained in:
Tom 2020-08-21 09:36:51 -06:00 • committed by Andreas Kling
parent 0e69ebbce4
commit f0906250a1
31 changed files with 87 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/VM/MemoryManager.cpp
View file

@ -26,6 +26,7 @@
#include <AK/Assertions.h>
#include <AK/Memory.h>
#include <AK/Singleton.h>
#include <AK/StringView.h>
#include <Kernel/Arch/i386/CPU.h>
#include <Kernel/CMOS.h>
@ -39,7 +40,6 @@
#include <Kernel/VM/PhysicalRegion.h>
#include <Kernel/VM/PurgeableVMObject.h>
#include <Kernel/VM/SharedInodeVMObject.h>
#include <Kernel/Singleton.h>
#include <Kernel/StdLib.h>
//#define MM_DEBUG
@ -51,7 +51,7 @@ extern FlatPtr end_of_kernel_bss;
namespace Kernel {
static auto s_the = make_singleton<MemoryManager>();
static auto s_the = AK::make_singleton<MemoryManager>();
RecursiveSpinLock s_mm_lock;
MemoryManager& MM

4
Kernel/VM/PageDirectory.cpp
View file

@ -25,9 +25,9 @@
*/
#include <AK/Memory.h>
#include <AK/Singleton.h>
#include <Kernel/Process.h>
#include <Kernel/Random.h>
#include <Kernel/Singleton.h>
#include <Kernel/Thread.h>
#include <Kernel/VM/MemoryManager.h>
#include <Kernel/VM/PageDirectory.h>
@ -38,7 +38,7 @@ static const FlatPtr userspace_range_base = 0x00800000;
static const FlatPtr userspace_range_ceiling = 0xbe000000;
static const FlatPtr kernelspace_range_base = 0xc0800000;
static auto s_cr3_map = make_singleton<HashMap<u32, PageDirectory*>>();
static auto s_cr3_map = AK::make_singleton<HashMap<u32, PageDirectory*>>();
static HashMap<u32, PageDirectory*>& cr3_map()
{