From b18a7297c58a97fcfe501f7df0fb628125884278 Mon Sep 17 00:00:00 2001
From: Timon Kruiper <timonkruiper@gmail.com>
Date: Tue, 25 Oct 2022 22:17:57 +0200
Subject: [PATCH] Kernel: Move ScopedCritical.cpp to Kernel base directory

This file does not contain any architecture specific implementations,
so we can move it to the Kernel base directory. Also update the relevant
include paths.
---
 AK/Singleton.h                              |  2 +-
 Kernel/Arch/aarch64/ScopedCritical.cpp      | 37 ---------------------
 Kernel/Arch/x86_64/Processor.cpp            |  2 +-
 Kernel/CMakeLists.txt                       |  3 +-
 Kernel/Library/LockRefPtr.h                 |  2 +-
 Kernel/Library/LockWeakable.h               |  2 +-
 Kernel/Library/NonnullLockRefPtr.h          |  2 +-
 Kernel/{Arch/x86_64 => }/ScopedCritical.cpp |  2 +-
 Kernel/{Arch => }/ScopedCritical.h          |  0
 9 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 Kernel/Arch/aarch64/ScopedCritical.cpp
 rename Kernel/{Arch/x86_64 => }/ScopedCritical.cpp (95%)
 rename Kernel/{Arch => }/ScopedCritical.h (100%)

diff --git a/AK/Singleton.h b/AK/Singleton.h
index a4ade26609..ed104befd0 100644
--- a/AK/Singleton.h
+++ b/AK/Singleton.h
@@ -11,8 +11,8 @@
 #include <AK/Noncopyable.h>
 #ifdef KERNEL
 #    include <Kernel/Arch/Processor.h>
-#    include <Kernel/Arch/ScopedCritical.h>
 #    include <Kernel/Locking/SpinlockProtected.h>
+#    include <Kernel/ScopedCritical.h>
 #elif defined(AK_OS_WINDOWS)
 // Forward declare to avoid pulling Windows.h into every file in existence.
 extern "C" __declspec(dllimport) void __stdcall Sleep(unsigned long);
diff --git a/Kernel/Arch/aarch64/ScopedCritical.cpp b/Kernel/Arch/aarch64/ScopedCritical.cpp
deleted file mode 100644
index 916e8c7ddb..0000000000
--- a/Kernel/Arch/aarch64/ScopedCritical.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#include <Kernel/Arch/ScopedCritical.h>
-
-#include <Kernel/Arch/Processor.h>
-
-namespace Kernel {
-
-ScopedCritical::ScopedCritical() = default;
-ScopedCritical::~ScopedCritical() = default;
-
-ScopedCritical::ScopedCritical(ScopedCritical&& /*from*/)
-{
-    TODO_AARCH64();
-}
-
-ScopedCritical& ScopedCritical::operator=(ScopedCritical&& /*from*/)
-{
-    TODO_AARCH64();
-    return *this;
-}
-
-void ScopedCritical::leave()
-{
-    TODO_AARCH64();
-}
-
-void ScopedCritical::enter()
-{
-    TODO_AARCH64();
-}
-
-}
diff --git a/Kernel/Arch/x86_64/Processor.cpp b/Kernel/Arch/x86_64/Processor.cpp
index 37a7c7e514..96e363a157 100644
--- a/Kernel/Arch/x86_64/Processor.cpp
+++ b/Kernel/Arch/x86_64/Processor.cpp
@@ -24,11 +24,11 @@
 #include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/SafeMem.h>
-#include <Kernel/Arch/ScopedCritical.h>
 #include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Arch/x86_64/CPUID.h>
 #include <Kernel/Arch/x86_64/MSR.h>
 #include <Kernel/Arch/x86_64/ProcessorInfo.h>
+#include <Kernel/ScopedCritical.h>
 
 #include <Kernel/Memory/PageDirectory.h>
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 64f3446983..a14c4cc833 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -260,6 +260,7 @@ set(KERNEL_SOURCES
     ProcessProcFSTraits.cpp
     Random.cpp
     Scheduler.cpp
+    ScopedCritical.cpp
     StdLib.cpp
     Syscalls/anon_create.cpp
     Syscalls/alarm.cpp
@@ -390,7 +391,6 @@ if ("${SERENITY_ARCH}" STREQUAL "x86_64")
         Arch/x86_64/VGA/IOArbiter.cpp
 
         Arch/x86_64/RTC.cpp
-        Arch/x86_64/ScopedCritical.cpp
         Arch/x86_64/Shutdown.cpp
         Arch/x86_64/SmapDisabler.cpp
 
@@ -466,7 +466,6 @@ elseif("${SERENITY_ARCH}" STREQUAL "aarch64")
         Arch/aarch64/Panic.cpp
         Arch/aarch64/Processor.cpp
         Arch/aarch64/SafeMem.cpp
-        Arch/aarch64/ScopedCritical.cpp
         Arch/aarch64/SmapDisabler.cpp
         Arch/aarch64/vector_table.S
     )
diff --git a/Kernel/Library/LockRefPtr.h b/Kernel/Library/LockRefPtr.h
index a124ef3d31..819acfd874 100644
--- a/Kernel/Library/LockRefPtr.h
+++ b/Kernel/Library/LockRefPtr.h
@@ -16,7 +16,7 @@
 #include <Kernel/Library/NonnullLockRefPtr.h>
 #ifdef KERNEL
 #    include <Kernel/Arch/Processor.h>
-#    include <Kernel/Arch/ScopedCritical.h>
+#    include <Kernel/ScopedCritical.h>
 #endif
 
 #define LOCKREFPTR_SCRUB_BYTE 0xa0
diff --git a/Kernel/Library/LockWeakable.h b/Kernel/Library/LockWeakable.h
index 0c3776ed72..5c21382e25 100644
--- a/Kernel/Library/LockWeakable.h
+++ b/Kernel/Library/LockWeakable.h
@@ -11,8 +11,8 @@
 #include <AK/AtomicRefCounted.h>
 #include <AK/StdLibExtras.h>
 #include <Kernel/Arch/Processor.h>
-#include <Kernel/Arch/ScopedCritical.h>
 #include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/ScopedCritical.h>
 
 namespace AK {
 
diff --git a/Kernel/Library/NonnullLockRefPtr.h b/Kernel/Library/NonnullLockRefPtr.h
index 6b6039a9a9..643fec04de 100644
--- a/Kernel/Library/NonnullLockRefPtr.h
+++ b/Kernel/Library/NonnullLockRefPtr.h
@@ -14,7 +14,7 @@
 #include <AK/Types.h>
 #ifdef KERNEL
 #    include <Kernel/Arch/Processor.h>
-#    include <Kernel/Arch/ScopedCritical.h>
+#    include <Kernel/ScopedCritical.h>
 #endif
 
 #define NONNULLLOCKREFPTR_SCRUB_BYTE 0xa1
diff --git a/Kernel/Arch/x86_64/ScopedCritical.cpp b/Kernel/ScopedCritical.cpp
similarity index 95%
rename from Kernel/Arch/x86_64/ScopedCritical.cpp
rename to Kernel/ScopedCritical.cpp
index 5b1698e525..c97478c6d5 100644
--- a/Kernel/Arch/x86_64/ScopedCritical.cpp
+++ b/Kernel/ScopedCritical.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/ScopedCritical.h>
+#include <Kernel/ScopedCritical.h>
 
 #include <Kernel/Arch/Processor.h>
 
diff --git a/Kernel/Arch/ScopedCritical.h b/Kernel/ScopedCritical.h
similarity index 100%
rename from Kernel/Arch/ScopedCritical.h
rename to Kernel/ScopedCritical.h