merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-05-01 15:10:44 +02:00
commit c6fb51295b
35 files changed
+414 -394

No files matched your search

+2
View File
@@ -66,10 +66,12 @@ multiboot_header:
.long -0x1BADB002 - MULTIBOOT_MEMORY_INFO
codestart:
#ifdef GRUB_MACHINE_MULTIBOOT
cmpl $MULTIBOOT_BOOTLOADER_MAGIC, %eax
jne 0f
movl %ebx, EXT_C(startup_multiboot_info)
0:
#endif
/* initialize the stack */
movl $GRUB_MEMORY_MACHINE_PROT_STACK, %esp