Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[mboot] Oops

This commit is contained in:
Kevin Lange 2011-04-06 17:06:07 -05:00
parent d5a3728b12
commit 75a221829d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/main.c
View File

@ -66,9 +66,7 @@ int main(struct multiboot *mboot, uint32_t mboot_mag, uintptr_t esp)
*/
boot_mode = multiboot;
void * new_mboot = (void *)0x10000000;
memcpy(new_mboot, mboot, sizeof(struct multiboot));
mboot_ptr = (struct multiboot *)new_mboot;
mboot_ptr = mboot;
/*
* Realign memory to the end of the multiboot modules
@ -79,7 +77,6 @@ int main(struct multiboot *mboot, uint32_t mboot_mag, uintptr_t esp)
if (mboot_ptr->flags & (1 << 3)) {
ramdisk = (char *)module_start;
#if 0
/*
* Mboot modules are available.
*/
@ -92,7 +89,6 @@ int main(struct multiboot *mboot, uint32_t mboot_mag, uintptr_t esp)
ramdisk = (char *)kmalloc(module_end - module_start); /* New chunk of ram for it. */
memcpy(ramdisk, (char *)module_start, module_end - module_start); /* Copy it over. */
}
#endif
}
} else {
/*