From 313ee8dd19145d7471ff462b8fe7d0bdc19703a6 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Sat, 16 Mar 2019 13:18:22 +0100
Subject: [PATCH] Move Lock from AK to Kernel, since it only works inside the
 kernel.

---
 Kernel/DoubleBuffer.h     |  2 +-
 Kernel/FileSystem.h       |  2 +-
 Kernel/IDEDiskDevice.cpp  |  2 +-
 Kernel/IDEDiskDevice.h    |  2 +-
 Kernel/IPv4Socket.h       |  2 +-
 {AK => Kernel}/Lock.h     | 17 +++--------------
 Kernel/NetworkAdapter.cpp |  2 +-
 Kernel/NetworkTask.cpp    |  2 +-
 Kernel/PTYMultiplexer.h   |  2 +-
 Kernel/ProcFS.h           |  2 +-
 Kernel/Process.h          |  2 +-
 Kernel/Socket.h           |  2 +-
 12 files changed, 14 insertions(+), 25 deletions(-)
 rename {AK => Kernel}/Lock.h (92%)

diff --git a/Kernel/DoubleBuffer.h b/Kernel/DoubleBuffer.h
index fc351a65c8..437bc5a372 100644
--- a/Kernel/DoubleBuffer.h
+++ b/Kernel/DoubleBuffer.h
@@ -2,7 +2,7 @@
 
 #include <AK/Types.h>
 #include <AK/Vector.h>
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 
 class DoubleBuffer {
 public:
diff --git a/Kernel/FileSystem.h b/Kernel/FileSystem.h
index a186c4ff6d..fd58c15720 100644
--- a/Kernel/FileSystem.h
+++ b/Kernel/FileSystem.h
@@ -13,7 +13,7 @@
 #include <AK/AKString.h>
 #include <AK/Function.h>
 #include <AK/kstdio.h>
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 #include <AK/WeakPtr.h>
 #include <Kernel/KResult.h>
 
diff --git a/Kernel/IDEDiskDevice.cpp b/Kernel/IDEDiskDevice.cpp
index b557a119cd..ba70225cd7 100644
--- a/Kernel/IDEDiskDevice.cpp
+++ b/Kernel/IDEDiskDevice.cpp
@@ -5,7 +5,7 @@
 #include "IO.h"
 #include "Scheduler.h"
 #include "PIC.h"
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 
 //#define DISK_DEBUG
 
diff --git a/Kernel/IDEDiskDevice.h b/Kernel/IDEDiskDevice.h
index 1f0424bb1e..60a23507d8 100644
--- a/Kernel/IDEDiskDevice.h
+++ b/Kernel/IDEDiskDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 #include <AK/RetainPtr.h>
 #include <Kernel/DiskDevice.h>
 #include "IRQHandler.h"
diff --git a/Kernel/IPv4Socket.h b/Kernel/IPv4Socket.h
index 1d249dece7..dd7cb5b957 100644
--- a/Kernel/IPv4Socket.h
+++ b/Kernel/IPv4Socket.h
@@ -4,7 +4,7 @@
 #include <Kernel/DoubleBuffer.h>
 #include <Kernel/IPv4.h>
 #include <AK/HashMap.h>
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 #include <AK/SinglyLinkedList.h>
 
 class IPv4SocketHandle;
diff --git a/AK/Lock.h b/Kernel/Lock.h
similarity index 92%
rename from AK/Lock.h
rename to Kernel/Lock.h
index 3b346aa5a0..4854ce7ccb 100644
--- a/AK/Lock.h
+++ b/Kernel/Lock.h
@@ -1,19 +1,13 @@
 #pragma once
 
-#include "Assertions.h"
-#include "Types.h"
-#include "i386.h"
+#include <AK/Assertions.h>
+#include <AK/Types.h>
+#include <Kernel/i386.h>
 #include <Kernel/Scheduler.h>
 
 class Process;
 extern Process* current;
 
-#ifndef KERNEL
-#error This thing is kernel-only right now.
-#endif
-
-namespace AK {
-
 static inline dword CAS(volatile dword* mem, dword newval, dword oldval)
 {
     dword ret;
@@ -117,8 +111,3 @@ private:
     Lock m_lock;
 };
 
-}
-
-using AK::Lock;
-using AK::Locker;
-using AK::Lockable;
diff --git a/Kernel/NetworkAdapter.cpp b/Kernel/NetworkAdapter.cpp
index 001d32b59c..fb09272a98 100644
--- a/Kernel/NetworkAdapter.cpp
+++ b/Kernel/NetworkAdapter.cpp
@@ -4,7 +4,7 @@
 #include <Kernel/kmalloc.h>
 #include <Kernel/EtherType.h>
 #include <AK/HashTable.h>
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 
 static Lockable<HashTable<NetworkAdapter*>>& all_adapters()
 {
diff --git a/Kernel/NetworkTask.cpp b/Kernel/NetworkTask.cpp
index 4b129723f2..41ccc9bb4a 100644
--- a/Kernel/NetworkTask.cpp
+++ b/Kernel/NetworkTask.cpp
@@ -10,7 +10,7 @@
 #include <Kernel/UDPSocket.h>
 #include <Kernel/Process.h>
 #include <Kernel/EtherType.h>
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 
 //#define ETHERNET_DEBUG
 #define IPV4_DEBUG
diff --git a/Kernel/PTYMultiplexer.h b/Kernel/PTYMultiplexer.h
index d5d875235d..05b7c80eb2 100644
--- a/Kernel/PTYMultiplexer.h
+++ b/Kernel/PTYMultiplexer.h
@@ -2,7 +2,7 @@
 
 #include <Kernel/CharacterDevice.h>
 #include <AK/Badge.h>
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 
 class MasterPTY;
 
diff --git a/Kernel/ProcFS.h b/Kernel/ProcFS.h
index 35b0264d84..23a84062f2 100644
--- a/Kernel/ProcFS.h
+++ b/Kernel/ProcFS.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem.h>
 
diff --git a/Kernel/Process.h b/Kernel/Process.h
index f830fddb9d..9067d45ac4 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -12,7 +12,7 @@
 #include <AK/Vector.h>
 #include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 
 class FileDescriptor;
 class PageDirectory;
diff --git a/Kernel/Socket.h b/Kernel/Socket.h
index f741df270b..a24fc896ff 100644
--- a/Kernel/Socket.h
+++ b/Kernel/Socket.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/Lock.h>
+#include <Kernel/Lock.h>
 #include <AK/Retainable.h>
 #include <AK/RetainPtr.h>
 #include <AK/HashTable.h>