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

[vari] Fix a typo, move some stuff

Browse Source
This commit is contained in:
Kevin Lange 2011-02-27 21:08:55 -06:00
parent fd57f9df32
commit 4f8cd57996
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -33,9 +33,9 @@ toaruos-kernel: kernel/start.o kernel/link.ld kernel/main.o ${MODULES} ${FILESYS
@${ECHO} "\r\033[32;1m LD $<\033[0m"
@${ECHO} "\033[34;1m -- Kernel is ready!\033[0m"
kernel/start.o: kernel/start.asm
kernel/start.o: kernel/start.s
@${ECHO} -n "\033[32m yasm $<\033[0m"
@${YASM} -f elf -o kernel/start.o kernel/start.asm
@${YASM} -f elf -o kernel/start.o kernel/start.s
@${ECHO} "\r\033[32;1m yasm $<\033[0m"
%.o: %.c

2
kernel/main.c
View File

@ -60,7 +60,7 @@ int main(struct multiboot *mboot_ptr, uint32_t mboot_mag)
char * ramdisk = NULL;
if (mboot_mag == MULTIBOOT_EAX_MAGIC) {
boot_mode = multiboot;
/* Realing memory to the end of the multiboot modules */
/* Realign memory to the end of the multiboot modules */
kmalloc_startat(0x200000);
if (mboot_ptr->flags & (1 << 3)) {
if (mboot_ptr->mods_count > 0) {

0
kernel/start.asm → kernel/start.s
View File