diff options
| author | Freya Murphy <freya@freyacat.org> | 2024-02-01 12:48:55 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2024-02-01 12:49:44 -0500 |
| commit | 192a4ccd6bbc2239f047f782a05e888990011e51 (patch) | |
| tree | 2b3d8a194d3dd33a5d344b4ec6376dbdfdb3eb0c /src/arch/amd64/shim.c | |
| parent | undo bad decisions (diff) | |
| download | corn-192a4ccd6bbc2239f047f782a05e888990011e51.tar.gz corn-192a4ccd6bbc2239f047f782a05e888990011e51.tar.bz2 corn-192a4ccd6bbc2239f047f782a05e888990011e51.zip | |
acpi, fix mboot memory map, fix kalloc, fix virtalloc node allocator, add kprintf, other changes
Diffstat (limited to 'src/arch/amd64/shim.c')
| -rw-r--r-- | src/arch/amd64/shim.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/amd64/shim.c b/src/arch/amd64/shim.c index 7332994..3c0bd72 100644 --- a/src/arch/amd64/shim.c +++ b/src/arch/amd64/shim.c @@ -11,14 +11,13 @@ static struct boot_info boot_info; -void* amd64_shim(void *mboot_data_ptr) { - +void* amd64_shim(long mboot_magic, void *mboot_data_ptr) { serial_init(); paging_init(); pic_remap(); idt_init(); - mboot_load_info(mboot_data_ptr, &boot_info); + mboot_load_info(mboot_magic, mboot_data_ptr, &boot_info); return &boot_info; } |