kernel: move /mem/alloc to /malloc and linker.ld to arch/amd64/

14 files changed, 12 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index bce5148..3f91c2e 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ clean:
 out/boot.iso: out/fs/boot/kernel out/fs/boot/grub/grub.cfg out/fs/boot/init
 	@grub-mkrescue -o $@ out/fs/ > /dev/null 2>&1
 
-out/fs/boot/kernel: src/kernel/linker.ld \
+out/fs/boot/kernel: src/kernel/arch/amd64/linker.ld \
                     $(call from_sources, src/kernel/) \
                     $(call from_sources, src/shared/)
 	@mkdir -p $(@D)
diff --git a/src/kernel/arch/amd64/boot.c b/src/kernel/arch/amd64/boot.c
index c645fb6..337d23b 100644
--- a/src/kernel/arch/amd64/boot.c
+++ b/src/kernel/arch/amd64/boot.c
@@ -6,7 +6,7 @@
 #include <kernel/arch/amd64/pci.h>
 #include <kernel/arch/amd64/tty/tty.h>
 #include <kernel/arch/generic.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/proc.h>
 
diff --git a/src/kernel/linker.ld b/src/kernel/arch/amd64/linker.ld
index a910d4e..a910d4e 100644
--- a/src/kernel/linker.ld
+++ b/src/kernel/arch/amd64/linker.ld
diff --git a/src/kernel/arch/amd64/pagedir.c b/src/kernel/arch/amd64/pagedir.c
index 9250a01..d56a548 100644
--- a/src/kernel/arch/amd64/pagedir.c
+++ b/src/kernel/arch/amd64/pagedir.c
@@ -1,6 +1,6 @@
 #include <kernel/arch/amd64/paging.h>
 #include <kernel/arch/generic.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <shared/mem.h>
 #include <stdint.h>
diff --git a/src/kernel/execbuf.c b/src/kernel/execbuf.c
index 8f7e22e..33bb94a 100644
--- a/src/kernel/execbuf.c
+++ b/src/kernel/execbuf.c
@@ -1,7 +1,7 @@
 #include <camellia/execbuf.h>
 #include <camellia/syscalls.h>
 #include <kernel/execbuf.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <shared/mem.h>
 
diff --git a/src/kernel/handle.c b/src/kernel/handle.c
index 156be12..51a95be 100644
--- a/src/kernel/handle.c
+++ b/src/kernel/handle.c
@@ -1,5 +1,5 @@
 #include <kernel/handle.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/pipe.h>
 #include <kernel/proc.h>
diff --git a/src/kernel/mem/alloc.c b/src/kernel/malloc.c
index a8e5aed..8c52b6f 100644
--- a/src/kernel/mem/alloc.c
+++ b/src/kernel/malloc.c
@@ -1,12 +1,12 @@
 #include <kernel/arch/generic.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/util.h>
 #include <shared/mem.h>
 #include <stdbool.h>
 #include <stdint.h>
 
-#define MALLOC_MAGIC 0xACAB1312
+#define MALLOC_MAGIC 0xA770C666
 
 struct malloc_hdr {
 	uint32_t magic;
diff --git a/src/kernel/mem/alloc.h b/src/kernel/malloc.h
index 671a468..671a468 100644
--- a/src/kernel/mem/alloc.h
+++ b/src/kernel/malloc.h
diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 836490b..65cbd81 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -2,7 +2,7 @@
 #include <camellia/flags.h>
 #include <kernel/arch/generic.h>
 #include <kernel/execbuf.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/proc.h>
 #include <kernel/vfs/mount.h>
diff --git a/src/kernel/ring.c b/src/kernel/ring.c
deleted file mode 100644
index e69de29..0000000
--- a/src/kernel/ring.c
+++ /dev/null
diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c
index 72d19f0..259b59f 100644
--- a/src/kernel/syscalls.c
+++ b/src/kernel/syscalls.c
@@ -4,7 +4,7 @@
 #include <camellia/flags.h>
 #include <camellia/syscalls.h>
 #include <kernel/arch/generic.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/pipe.h>
 #include <kernel/proc.h>
diff --git a/src/kernel/vfs/mount.c b/src/kernel/vfs/mount.c
index 2518989..b4f5b0f 100644
--- a/src/kernel/vfs/mount.c
+++ b/src/kernel/vfs/mount.c
@@ -1,4 +1,4 @@
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/vfs/mount.h>
 #include <shared/mem.h>
diff --git a/src/kernel/vfs/procfs.c b/src/kernel/vfs/procfs.c
index ecca839..4f2bbd1 100644
--- a/src/kernel/vfs/procfs.c
+++ b/src/kernel/vfs/procfs.c
@@ -1,5 +1,5 @@
 #include <camellia/errno.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/proc.h>
 #include <kernel/vfs/procfs.h>
diff --git a/src/kernel/vfs/request.c b/src/kernel/vfs/request.c
index 35df29c..410e41e 100644
--- a/src/kernel/vfs/request.c
+++ b/src/kernel/vfs/request.c
@@ -1,6 +1,6 @@
 #include <camellia/errno.h>
 #include <camellia/flags.h>
-#include <kernel/mem/alloc.h>
+#include <kernel/malloc.h>
 #include <kernel/panic.h>
 #include <kernel/proc.h>
 #include <kernel/vfs/request.h>