diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-07-09 14:50:01 +0200 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-07-09 15:04:45 +0200 |
| commit | 23a6c2086bd0feedc40bea7c40d9c9c042404852 (patch) | |
| tree | ec5d78ef517ffcb634ffa2099db0290ba1c38d7c | |
| parent | f4cec2f11086a355f01c616ba9cb092d56c0319f (diff) | |
| download | serenity-23a6c2086bd0feedc40bea7c40d9c9c042404852.zip | |
Kernel: Move SharedMemory.{cpp,h} into FileSystem/
| -rw-r--r-- | Kernel/FileSystem/FileDescription.cpp | 2 | ||||
| -rw-r--r-- | Kernel/FileSystem/SharedMemory.cpp (renamed from Kernel/SharedMemory.cpp) | 2 | ||||
| -rw-r--r-- | Kernel/FileSystem/SharedMemory.h (renamed from Kernel/SharedMemory.h) | 0 | ||||
| -rw-r--r-- | Kernel/Makefile | 2 | ||||
| -rw-r--r-- | Kernel/Process.cpp | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/Kernel/FileSystem/FileDescription.cpp b/Kernel/FileSystem/FileDescription.cpp index 4d9e3013a1..8d15d04b83 100644 --- a/Kernel/FileSystem/FileDescription.cpp +++ b/Kernel/FileSystem/FileDescription.cpp @@ -6,9 +6,9 @@ #include <Kernel/FileSystem/FileDescription.h> #include <Kernel/FileSystem/FileSystem.h> #include <Kernel/FileSystem/InodeFile.h> +#include <Kernel/FileSystem/SharedMemory.h> #include <Kernel/Net/Socket.h> #include <Kernel/Process.h> -#include <Kernel/SharedMemory.h> #include <Kernel/TTY/MasterPTY.h> #include <Kernel/TTY/TTY.h> #include <Kernel/UnixTypes.h> diff --git a/Kernel/SharedMemory.cpp b/Kernel/FileSystem/SharedMemory.cpp index 52805a165a..9edffedd14 100644 --- a/Kernel/SharedMemory.cpp +++ b/Kernel/FileSystem/SharedMemory.cpp @@ -1,7 +1,7 @@ #include <AK/HashMap.h> +#include <Kernel/FileSystem/SharedMemory.h> #include <Kernel/Lock.h> #include <Kernel/Process.h> -#include <Kernel/SharedMemory.h> #include <Kernel/VM/VMObject.h> Lockable<HashMap<String, RefPtr<SharedMemory>>>& shared_memories() diff --git a/Kernel/SharedMemory.h b/Kernel/FileSystem/SharedMemory.h index 81a5860748..81a5860748 100644 --- a/Kernel/SharedMemory.h +++ b/Kernel/FileSystem/SharedMemory.h diff --git a/Kernel/Makefile b/Kernel/Makefile index 1f3ba29443..dc65c572b2 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -34,7 +34,7 @@ KERNEL_OBJS = \ DoubleBuffer.o \ KSyms.o \ KParams.o \ - SharedMemory.o \ + FileSystem/SharedMemory.o \ FileSystem/DevPtsFS.o \ Devices/BXVGADevice.o \ PCI.o \ diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index d1b89230b6..30ba9844a8 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -10,6 +10,7 @@ #include <Kernel/FileSystem/Custody.h> #include <Kernel/FileSystem/FIFO.h> #include <Kernel/FileSystem/FileDescription.h> +#include <Kernel/FileSystem/SharedMemory.h> #include <Kernel/FileSystem/VirtualFileSystem.h> #include <Kernel/KSyms.h> #include <Kernel/Multiboot.h> @@ -18,7 +19,6 @@ #include <Kernel/ProcessTracer.h> #include <Kernel/RTC.h> #include <Kernel/Scheduler.h> -#include <Kernel/SharedMemory.h> #include <Kernel/StdLib.h> #include <Kernel/Syscall.h> #include <Kernel/TTY/MasterPTY.h> |