aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/lib
diff options
context:
space:
mode:
authorMarvin Borner2020-05-19 21:55:27 +0200
committerMarvin Borner2020-05-19 21:55:27 +0200
commit61c7bf940d9f6dedb1b5c0307fd170cae562fbd1 (patch)
treec4b4381fd9519f8f43067e55718dd502b9100e0d /src/kernel/lib
parentffb7cb87593a5de58f7c5183020576dac9d50fc4 (diff)
Woah, so many changes :O
Diffstat (limited to 'src/kernel/lib')
-rw-r--r--src/kernel/lib/lib.h2
-rw-r--r--src/kernel/lib/memory.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/lib/lib.h b/src/kernel/lib/lib.h
index 6f2c04d..bdf0794 100644
--- a/src/kernel/lib/lib.h
+++ b/src/kernel/lib/lib.h
@@ -34,7 +34,7 @@ int memcmp(const void *a_ptr, const void *b_ptr, u32 size);
void memory_info_init(struct multiboot_tag_basic_meminfo *tag);
void memory_mmap_init(struct multiboot_tag_mmap *tag);
-int memory_init(u32 multiboot_address);
+int memory_init();
void memory_print();
u32 memory_get_all();
diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c
index 0f3cb34..0519492 100644
--- a/src/kernel/lib/memory.c
+++ b/src/kernel/lib/memory.c
@@ -98,7 +98,7 @@ void memory_mmap_init(struct multiboot_tag_mmap *tag)
total = sum >> 10; // I want kb
}
-int memory_init(u32 multiboot_address)
+int memory_init()
{
int ret = 0;
struct multiboot_tag *tag;