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

Revert "Kernel: Switch singletons to use new Singleton class"

Browse source 
This reverts commit f48feae0b2.
This commit is contained in:
Andreas Kling 2020-08-22 17:53:34 +02:00
parent 0addcb45b8
commit 2fd9e72264
44 changed files with 146 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Kernel/Interrupts/APIC.cpp
View file

@ -34,7 +34,6 @@
#include <Kernel/IO.h>
#include <Kernel/Interrupts/APIC.h>
#include <Kernel/Interrupts/SpuriousInterruptHandler.h>
#include <Kernel/Singleton.h>
#include <Kernel/Thread.h>
#include <Kernel/VM/MemoryManager.h>
#include <Kernel/VM/PageDirectory.h>
@ -69,7 +68,7 @@
namespace Kernel {
static auto s_apic = make_singleton<APIC>();
static APIC* s_apic;
class APICIPIInterruptHandler final : public GenericInterruptHandler {
public:
@ -133,7 +132,7 @@ private:
bool APIC::initialized()
{
return s_apic.is_initialized();
return (s_apic != nullptr);
}
APIC& APIC::the()
@ -145,7 +144,7 @@ APIC& APIC::the()
void APIC::initialize()
{
ASSERT(!APIC::initialized());
s_apic.ensure_instance();
s_apic = new APIC();
}
PhysicalAddress APIC::get_base()