2008-07-31 Bean <bean123ch@gmail.com>

	* boot/i386/pc/lnxboot.S (real_code_2): Replace 0x50 with
	GRUB_KERNEL_MACHINE_DATA_END.

diff --git a/ChangeLog b/ChangeLog
index 601dbf94b52b9c8ddcc06c6e6b93643cf9bf8fdf..717f9f1aa19dd7272a8cd338f5a110fc594db93c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-31  Bean  <bean123ch@gmail.com>
+
+       * boot/i386/pc/lnxboot.S (real_code_2): Replace 0x50 with
+       GRUB_KERNEL_MACHINE_DATA_END.
+
 2008-07-30  Robert Millan  <rmh@aybabtu.com>
 
        * include/grub/i386/pc/kernel.h (GRUB_KERNEL_MACHINE_DATA_END):

diff --git a/boot/i386/pc/lnxboot.S b/boot/i386/pc/lnxboot.S
index a8d056c5031704a69961e1e0b678ab6210f6a75f..e7f55df861014957ec1ca50cb13b7f969148f3a6 100644 (file)
--- a/boot/i386/pc/lnxboot.S
+++ b/boot/i386/pc/lnxboot.S
@@ -186,7 +186,7 @@ real_code_2:
        call    move_memory
 
        /* Check for multiboot signature.  */
-       cmpl    $MULTIBOOT_MAGIC, %ss:(DATA_ADDR + 0x50)
+       cmpl    $MULTIBOOT_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_DATA_END)
        jz      1f
 
        movl    (ramdisk_image - start), %esi