Merge my local branch
This commit is contained in:
commit
427d6aa453
9 changed files with 148 additions and 74 deletions
|
@ -66,7 +66,7 @@ multiboot_header:
|
|||
.long -0x1BADB002 - MULTIBOOT_MEMORY_INFO
|
||||
|
||||
codestart:
|
||||
cmpl $MULTIBOOT_MAGIC2, %eax
|
||||
cmpl $MULTIBOOT_BOOTLOADER_MAGIC, %eax
|
||||
jne 0f
|
||||
movl %ebx, EXT_C(startup_multiboot_info)
|
||||
0:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue