* grub-core/lib/i386/relocator16.S: Fix incorrect use of absolute

	address.

diff --git a/ChangeLog b/ChangeLog
index 7355a45501cd60520ba4b13e7bc666390887237e..5a7e7871c2c0eaafc844b3d8c20ae739cd6e1266 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/i386/relocator16.S: Fix incorrect use of absolute
+       address.
+
 2012-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/legacycfg.c (grub_cmd_legacy_kernel):

diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S
index ba8370686010839d1943347409bb5dd73f02f5bd..30629dbe15b984f893dd6d4bb4560a33d304ba86 100644 (file)
--- a/grub-core/lib/i386/relocator16.S
+++ b/grub-core/lib/i386/relocator16.S
@@ -105,7 +105,7 @@ VARIABLE(grub_relocator16_keep_a20_enabled)
 
        movw    %cs, %ax
        movw    %ax, %ss 
-       leaw    EXT_C(grub_relocator16_end) + GRUB_RELOCATOR16_STACK_SIZE, %sp
+       leaw    EXT_C(grub_relocator16_end) - LOCAL(base) + GRUB_RELOCATOR16_STACK_SIZE, %sp
 
        /* second, try a BIOS call */
        movw    $0x2400, %ax