From a667d88f939b02995f79a8da2739cfa5ec88a6fd Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Fri, 1 Mar 2024 15:51:02 +0200
Subject: [PATCH] Kernel: Remove now obsolete CriticalScope

All critical scopes in kernel are now replaced by SpinLocks. This
allows proper locking in actual multiprocessing with multiple cores.
---
 LibELF/LibELF/LoadableELF.cpp         |  1 -
 kernel/include/kernel/CriticalScope.h | 30 ---------------------------
 kernel/kernel/Storage/DiskCache.cpp   |  1 -
 3 files changed, 32 deletions(-)
 delete mode 100644 kernel/include/kernel/CriticalScope.h

diff --git a/LibELF/LibELF/LoadableELF.cpp b/LibELF/LibELF/LoadableELF.cpp
index e0a96cba..83ef8ba3 100644
--- a/LibELF/LibELF/LoadableELF.cpp
+++ b/LibELF/LibELF/LoadableELF.cpp
@@ -1,5 +1,4 @@
 #include <BAN/ScopeGuard.h>
-#include <kernel/CriticalScope.h>
 #include <kernel/Memory/Heap.h>
 #include <kernel/Lock/LockGuard.h>
 #include <LibELF/LoadableELF.h>
diff --git a/kernel/include/kernel/CriticalScope.h b/kernel/include/kernel/CriticalScope.h
deleted file mode 100644
index 33b7baf0..00000000
--- a/kernel/include/kernel/CriticalScope.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <BAN/NoCopyMove.h>
-
-#include <stddef.h>
-
-namespace Kernel
-{
-
-	class CriticalScope
-	{
-		BAN_NON_COPYABLE(CriticalScope);
-		BAN_NON_MOVABLE(CriticalScope);
-
-	public:
-		CriticalScope()
-		{
-			asm volatile("pushf; cli; pop %0" : "=r"(m_flags) :: "memory");
-		}
-
-		~CriticalScope()
-		{
-			asm volatile("push %0; popf" :: "rm"(m_flags) : "memory", "cc");
-		}
-
-	private:
-		size_t m_flags;
-	};
-
-}
diff --git a/kernel/kernel/Storage/DiskCache.cpp b/kernel/kernel/Storage/DiskCache.cpp
index b8302ee9..f72a4a1e 100644
--- a/kernel/kernel/Storage/DiskCache.cpp
+++ b/kernel/kernel/Storage/DiskCache.cpp
@@ -1,4 +1,3 @@
-#include <kernel/CriticalScope.h>
 #include <kernel/Lock/LockGuard.h>
 #include <kernel/Memory/Heap.h>
 #include <kernel/Memory/PageTable.h>