From: bean <bean@localhost>
Date: Thu, 31 Jul 2008 14:15:53 +0000 (+0000)
Subject: 2008-07-31  Bean  <bean123ch@gmail.com>
X-Git-Tag: 1.98~1362
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16e641b612c4b0b096983324e598be495678947f;p=thirdparty%2Fgrub.git

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 601dbf94b..717f9f1aa 100644
--- 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 a8d056c50..e7f55df86 100644
--- 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