[1837] 2008-08-30 Robert Millan <[email protected]>

Revision: 1837
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1837
Author:   robertmh
Date:     2008-08-30 17:51:24 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
2008-08-30  Robert Millan  <[email protected]>

        * 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).

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/i386/pc/startup.S

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2008-08-29 21:54:26 UTC (rev 1836)
+++ trunk/grub2/ChangeLog	2008-08-30 17:51:24 UTC (rev 1837)
@@ -1,3 +1,9 @@
+2008-08-30  Robert Millan  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* kern/powerpc/ieee1275/crt0.S: Rename to ...

Modified: trunk/grub2/kern/i386/pc/startup.S
===================================================================
--- trunk/grub2/kern/i386/pc/startup.S	2008-08-29 21:54:26 UTC (rev 1836)
+++ trunk/grub2/kern/i386/pc/startup.S	2008-08-30 17:51:24 UTC (rev 1837)
@@ -110,6 +110,7 @@
  * 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