aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 196b44e..412a289 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -7,18 +7,16 @@
#include <kernel/input/input.h>
#include <kernel/acpi/acpi.h>
#include <kernel/smbios/smbios.h>
-#include <kernel/fs/install.h>
#include <kernel/lib/lib.h>
#include <kernel/syscall/syscall.h>
#include <kernel/fs/marfs/marfs.h>
#include <kernel/fs/iso9660/iso9660.h>
#include <kernel/fs/atapi_pio.h>
#include <kernel/lib/stdlib/liballoc.h>
-#include <kernel/lib/stdio.h>
#include <kernel/pci/pci.h>
#include <kernel/net/network.h>
-extern void jump_userspace(uintptr_t location, uintptr_t stack);
+extern void jump_userspace();
void kernel_main()
{
@@ -66,10 +64,10 @@ void kernel_main()
if (!user_e) panic("Userspace binary not found!");
ATAPI_granular_read(1 + (user_e->length / 2048), user_e->lba, (uint8_t *) (userspace + 4096));
kfree(user_e);
- jump_userspace(userspace + 4096, (uintptr_t) umalloc(4096));
+ jump_userspace(userspace + 4096);
} else {
marfs_read_whole_file(4, (uint8_t *) (userspace + 4096));
- jump_userspace(userspace + 4096, (uintptr_t) umalloc(4096));
+ jump_userspace(userspace + 4096);
}
panic("This should NOT happen!");