From: robertmh Date: Sat, 30 Aug 2008 17:51:24 +0000 (+0000) Subject: 2008-08-30 Robert Millan X-Git-Tag: 1.98~1279 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cebd25a85db0cda744ac5342ea34ccc45508fba;p=thirdparty%2Fgrub.git 2008-08-30 Robert Millan * kern/i386/pc/startup.S (multiboot_header): Force 4-byte alignment as required by Multiboot spec (it was already 4-byte aligned, but only by chance). --- diff --git a/ChangeLog b/ChangeLog index 687db986b..ab0ebc1f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-30 Robert Millan + + * kern/i386/pc/startup.S (multiboot_header): Force 4-byte alignment + as required by Multiboot spec (it was already 4-byte aligned, but + only by chance). + 2008-08-29 Pavel Roskin * kern/powerpc/ieee1275/crt0.S: Rename to ... diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S index 197c447e3..18f61d801 100644 --- a/kern/i386/pc/startup.S +++ b/kern/i386/pc/startup.S @@ -110,6 +110,7 @@ VARIABLE(grub_prefix) * This uses the a.out kludge to load raw binary to the area starting at 1MB, * and relocates itself after loaded. */ + .p2align 2 /* force 4-byte alignment */ multiboot_header: /* magic */ .long 0x1BADB002