diff options
| author | Marvin Borner | 2020-04-28 20:59:57 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-04-28 20:59:57 +0200 |
| commit | 5f8b5ce7efb7738eaebad43f9648975788ae19ff (patch) | |
| tree | ab8fc4d4baa4adb99dc90461df689650acf34cef /src/kernel/kernel.c | |
| parent | bfe16de4be67565f1a1e7b1331fcbe3aedf9c54e (diff) | |
Fixed userspace entering...
Many other fixes too, but I won't mention them because I don't want to
:)
Diffstat (limited to 'src/kernel/kernel.c')
| -rw-r--r-- | src/kernel/kernel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 1b34a73..3efe193 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -44,8 +44,8 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp) isrs_install(); irq_install(); - memory_init(multiboot_address); paging_install(); + log("0x%x", multiboot_address); // TODO: Fix multiboot table mmap multiboot_parse(multiboot_address); // Install drivers @@ -79,4 +79,4 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp) log("Okidoko!"); halt_loop(); // asm ("div %0" :: "r"(0)); // Exception testing x/0 -} +}
\ No newline at end of file |