From 2c3b0baf7652e6ba64ffd1414997270a3ab3eaea Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Boric <jblbeurope@gmail.com>
Date: Sun, 18 Jul 2021 09:15:52 +0200
Subject: [PATCH] Kernel: Move SpinLock.h into Locking/

---
 Kernel/Bus/PCI/MMIOAccess.h               | 2 +-
 Kernel/ConsoleDevice.cpp                  | 2 +-
 Kernel/CoreDump.cpp                       | 2 +-
 Kernel/Devices/HID/HIDManagement.h        | 2 +-
 Kernel/Devices/HID/I8042Controller.h      | 2 +-
 Kernel/Devices/KCOVInstance.h             | 2 +-
 Kernel/FutexQueue.h                       | 2 +-
 Kernel/Graphics/Console/TextModeConsole.h | 2 +-
 Kernel/Graphics/FramebufferDevice.h       | 2 +-
 Kernel/Heap/kmalloc.cpp                   | 2 +-
 Kernel/Locking/Mutex.cpp                  | 2 +-
 Kernel/{ => Locking}/SpinLock.h           | 0
 Kernel/Memory/AddressSpace.cpp            | 2 +-
 Kernel/Memory/MemoryManager.h             | 2 +-
 Kernel/Memory/VirtualRangeAllocator.h     | 2 +-
 Kernel/ProcessGroup.h                     | 2 +-
 Kernel/Scheduler.h                        | 2 +-
 Kernel/Storage/AHCIPort.cpp               | 2 +-
 Kernel/Storage/AHCIPort.h                 | 2 +-
 Kernel/VirtIO/VirtIOQueue.h               | 2 +-
 Kernel/WaitQueue.h                        | 2 +-
 Kernel/WorkQueue.cpp                      | 2 +-
 Kernel/kprintf.cpp                        | 2 +-
 23 files changed, 22 insertions(+), 22 deletions(-)
 rename Kernel/{ => Locking}/SpinLock.h (100%)

diff --git a/Kernel/Bus/PCI/MMIOAccess.h b/Kernel/Bus/PCI/MMIOAccess.h
index c110161f84c..68972fb008c 100644
--- a/Kernel/Bus/PCI/MMIOAccess.h
+++ b/Kernel/Bus/PCI/MMIOAccess.h
@@ -12,11 +12,11 @@
 #include <AK/Types.h>
 #include <Kernel/ACPI/Definitions.h>
 #include <Kernel/Bus/PCI/Access.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/PhysicalRegion.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Memory/VMObject.h>
-#include <Kernel/SpinLock.h>
 
 namespace Kernel {
 namespace PCI {
diff --git a/Kernel/ConsoleDevice.cpp b/Kernel/ConsoleDevice.cpp
index 944ea48fe32..f1454008f24 100644
--- a/Kernel/ConsoleDevice.cpp
+++ b/Kernel/ConsoleDevice.cpp
@@ -7,8 +7,8 @@
 #include <AK/Singleton.h>
 #include <Kernel/ConsoleDevice.h>
 #include <Kernel/IO.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Sections.h>
-#include <Kernel/SpinLock.h>
 #include <Kernel/kstdio.h>
 
 // Output bytes to kernel debug port 0xE9 (Bochs console). It's very handy.
diff --git a/Kernel/CoreDump.cpp b/Kernel/CoreDump.cpp
index bbba0a8d797..120f73f5e0a 100644
--- a/Kernel/CoreDump.cpp
+++ b/Kernel/CoreDump.cpp
@@ -14,10 +14,10 @@
 #include <Kernel/FileSystem/FileDescription.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/KLexicalPath.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/ProcessPagingScope.h>
 #include <Kernel/Process.h>
 #include <Kernel/RTC.h>
-#include <Kernel/SpinLock.h>
 #include <LibC/elf.h>
 #include <LibELF/CoreDump.h>
 
diff --git a/Kernel/Devices/HID/HIDManagement.h b/Kernel/Devices/HID/HIDManagement.h
index 954e0d1af65..6a50f4db1d3 100644
--- a/Kernel/Devices/HID/HIDManagement.h
+++ b/Kernel/Devices/HID/HIDManagement.h
@@ -15,7 +15,7 @@
 #include <Kernel/API/KeyCode.h>
 #include <Kernel/API/MousePacket.h>
 #include <Kernel/KResult.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/UnixTypes.h>
 #include <LibKeyboard/CharacterMap.h>
 
diff --git a/Kernel/Devices/HID/I8042Controller.h b/Kernel/Devices/HID/I8042Controller.h
index a828a7261a2..5224cc1e80a 100644
--- a/Kernel/Devices/HID/I8042Controller.h
+++ b/Kernel/Devices/HID/I8042Controller.h
@@ -9,7 +9,7 @@
 #include <AK/RefCounted.h>
 #include <Kernel/Devices/HID/KeyboardDevice.h>
 #include <Kernel/Devices/HID/MouseDevice.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/KCOVInstance.h b/Kernel/Devices/KCOVInstance.h
index cb56d1250b0..fd0ecb76fd6 100644
--- a/Kernel/Devices/KCOVInstance.h
+++ b/Kernel/Devices/KCOVInstance.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
-#include <Kernel/SpinLock.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FutexQueue.h b/Kernel/FutexQueue.h
index 5cad5e3b18c..809478eff0d 100644
--- a/Kernel/FutexQueue.h
+++ b/Kernel/FutexQueue.h
@@ -8,8 +8,8 @@
 
 #include <AK/Atomic.h>
 #include <AK/RefCounted.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/VMObject.h>
-#include <Kernel/SpinLock.h>
 #include <Kernel/Thread.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Console/TextModeConsole.h b/Kernel/Graphics/Console/TextModeConsole.h
index 1950d098a41..b535a6850f2 100644
--- a/Kernel/Graphics/Console/TextModeConsole.h
+++ b/Kernel/Graphics/Console/TextModeConsole.h
@@ -9,7 +9,7 @@
 #include <AK/RefCounted.h>
 #include <AK/Types.h>
 #include <Kernel/Graphics/Console/VGAConsole.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 
 namespace Kernel::Graphics {
 class TextModeConsole final : public VGAConsole {
diff --git a/Kernel/Graphics/FramebufferDevice.h b/Kernel/Graphics/FramebufferDevice.h
index 9e013502ef3..145b7c70101 100644
--- a/Kernel/Graphics/FramebufferDevice.h
+++ b/Kernel/Graphics/FramebufferDevice.h
@@ -11,9 +11,9 @@
 #include <AK/Types.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Graphics/GraphicsDevice.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/PhysicalAddress.h>
-#include <Kernel/SpinLock.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Heap/kmalloc.cpp b/Kernel/Heap/kmalloc.cpp
index 2e58e563ccf..e7af6d1cbff 100644
--- a/Kernel/Heap/kmalloc.cpp
+++ b/Kernel/Heap/kmalloc.cpp
@@ -16,11 +16,11 @@
 #include <Kernel/Heap/Heap.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/KSyms.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Panic.h>
 #include <Kernel/PerformanceManager.h>
 #include <Kernel/Sections.h>
-#include <Kernel/SpinLock.h>
 #include <Kernel/StdLib.h>
 
 #define CHUNK_SIZE 32
diff --git a/Kernel/Locking/Mutex.cpp b/Kernel/Locking/Mutex.cpp
index 9a6266230da..70298e5b0d9 100644
--- a/Kernel/Locking/Mutex.cpp
+++ b/Kernel/Locking/Mutex.cpp
@@ -10,7 +10,7 @@
 #include <Kernel/Debug.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Thread.h>
 
 namespace Kernel {
diff --git a/Kernel/SpinLock.h b/Kernel/Locking/SpinLock.h
similarity index 100%
rename from Kernel/SpinLock.h
rename to Kernel/Locking/SpinLock.h
diff --git a/Kernel/Memory/AddressSpace.cpp b/Kernel/Memory/AddressSpace.cpp
index 2b4f92066ef..cc93760dcb1 100644
--- a/Kernel/Memory/AddressSpace.cpp
+++ b/Kernel/Memory/AddressSpace.cpp
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/AddressSpace.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/InodeVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/PerformanceManager.h>
 #include <Kernel/Process.h>
-#include <Kernel/SpinLock.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Memory/MemoryManager.h b/Kernel/Memory/MemoryManager.h
index aaf809acc27..227e3539c2d 100644
--- a/Kernel/Memory/MemoryManager.h
+++ b/Kernel/Memory/MemoryManager.h
@@ -14,12 +14,12 @@
 #include <Kernel/Arch/x86/PageFault.h>
 #include <Kernel/Arch/x86/TrapFrame.h>
 #include <Kernel/Forward.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/AllocationStrategy.h>
 #include <Kernel/Memory/PhysicalPage.h>
 #include <Kernel/Memory/PhysicalRegion.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Memory/VMObject.h>
-#include <Kernel/SpinLock.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Memory/VirtualRangeAllocator.h b/Kernel/Memory/VirtualRangeAllocator.h
index 025dd41bf6e..b64b4c3875e 100644
--- a/Kernel/Memory/VirtualRangeAllocator.h
+++ b/Kernel/Memory/VirtualRangeAllocator.h
@@ -8,8 +8,8 @@
 
 #include <AK/RedBlackTree.h>
 #include <AK/Traits.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/VirtualRange.h>
-#include <Kernel/SpinLock.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/ProcessGroup.h b/Kernel/ProcessGroup.h
index a2f5b2af0cd..0798afd8f83 100644
--- a/Kernel/ProcessGroup.h
+++ b/Kernel/ProcessGroup.h
@@ -9,7 +9,7 @@
 #include <AK/IntrusiveList.h>
 #include <AK/RefCounted.h>
 #include <AK/Weakable.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/UnixTypes.h>
 
 namespace Kernel {
diff --git a/Kernel/Scheduler.h b/Kernel/Scheduler.h
index 9a17758500f..ed35ad94490 100644
--- a/Kernel/Scheduler.h
+++ b/Kernel/Scheduler.h
@@ -11,7 +11,7 @@
 #include <AK/IntrusiveList.h>
 #include <AK/Types.h>
 #include <Kernel/Forward.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Time/TimeManagement.h>
 #include <Kernel/UnixTypes.h>
 
diff --git a/Kernel/Storage/AHCIPort.cpp b/Kernel/Storage/AHCIPort.cpp
index 2bac4f40fbd..947477c5bc3 100644
--- a/Kernel/Storage/AHCIPort.cpp
+++ b/Kernel/Storage/AHCIPort.cpp
@@ -8,10 +8,10 @@
 // please look at Documentation/Kernel/AHCILocking.md
 
 #include <AK/Atomic.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/ScatterGatherList.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/SpinLock.h>
 #include <Kernel/Storage/AHCIPort.h>
 #include <Kernel/Storage/ATA.h>
 #include <Kernel/Storage/SATADiskDevice.h>
diff --git a/Kernel/Storage/AHCIPort.h b/Kernel/Storage/AHCIPort.h
index 4c660cf731d..dde96751da1 100644
--- a/Kernel/Storage/AHCIPort.h
+++ b/Kernel/Storage/AHCIPort.h
@@ -12,13 +12,13 @@
 #include <Kernel/IO.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/PhysicalPage.h>
 #include <Kernel/Memory/ScatterGatherList.h>
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/Random.h>
 #include <Kernel/Sections.h>
-#include <Kernel/SpinLock.h>
 #include <Kernel/Storage/AHCI.h>
 #include <Kernel/Storage/AHCIPortHandler.h>
 #include <Kernel/Storage/StorageDevice.h>
diff --git a/Kernel/VirtIO/VirtIOQueue.h b/Kernel/VirtIO/VirtIOQueue.h
index b081c531bcf..233f8ce0e23 100644
--- a/Kernel/VirtIO/VirtIOQueue.h
+++ b/Kernel/VirtIO/VirtIOQueue.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/ScatterGatherList.h>
-#include <Kernel/SpinLock.h>
 
 namespace Kernel {
 
diff --git a/Kernel/WaitQueue.h b/Kernel/WaitQueue.h
index dd8af0089e2..6069380059a 100644
--- a/Kernel/WaitQueue.h
+++ b/Kernel/WaitQueue.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Atomic.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Thread.h>
 
 namespace Kernel {
diff --git a/Kernel/WorkQueue.cpp b/Kernel/WorkQueue.cpp
index 1d00dcef1a7..dc7e6da7af6 100644
--- a/Kernel/WorkQueue.cpp
+++ b/Kernel/WorkQueue.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/Process.h>
 #include <Kernel/Sections.h>
-#include <Kernel/SpinLock.h>
 #include <Kernel/WaitQueue.h>
 #include <Kernel/WorkQueue.h>
 
diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp
index 253c55b2f3b..53fceb176a5 100644
--- a/Kernel/kprintf.cpp
+++ b/Kernel/kprintf.cpp
@@ -10,7 +10,7 @@
 #include <Kernel/Devices/PCISerialDevice.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/IO.h>
-#include <Kernel/SpinLock.h>
+#include <Kernel/Locking/SpinLock.h>
 #include <Kernel/TTY/ConsoleManagement.h>
 #include <Kernel/kstdio.h>