Fix bug introduced by previous commit.

	* grub-core/boot/i386/pc/startup_raw.S: Compute RS start correctly.

diff --git a/ChangeLog b/ChangeLog
index eeb9bda57591bc854719f24a3ad024edcaea5bef..70db7537951dfc92173fab043256a7eded280915 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix bug introduced by previous commit.
+
+       * grub-core/boot/i386/pc/startup_raw.S: Compute RS start correctly.
+
 2011-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Use decompressors framework on i386-pc. It increases core size

diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S
index 4820e34424d8b827b2bdbca2a550b1073d625975..09b6fed7634aacc2af9f1e6d120a209e5671b2fd 100644 (file)
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -107,7 +107,7 @@ LOCAL (codestart):
        call    grub_gate_a20
 
        movl    LOCAL(compressed_size), %edx
-       addl    $(LOCAL(decompressor_end) - GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART), %edx
+       addl    $(LOCAL(decompressor_end) - GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART - _start), %edx
        movl    reed_solomon_redundancy, %ecx
        leal    _start + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART, %eax
        call    EXT_C (grub_reed_solomon_recover)