From 4cebd25a85db0cda744ac5342ea34ccc45508fba Mon Sep 17 00:00:00 2001 From: robertmh Date: Sat, 30 Aug 2008 17:51:24 +0000 Subject: [PATCH] 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). --- ChangeLog | 6 ++++++ kern/i386/pc/startup.S | 1 + 2 files changed, 7 insertions(+) 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