From: Vladimir 'phcoder' Serbinenko Date: Sat, 12 Nov 2011 19:53:46 +0000 (+0100) Subject: Fix bug introduced by previous commit. X-Git-Tag: 2.00~951 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=691cbb58163628d7244b66997e713f443b8af8e3;p=thirdparty%2Fgrub.git 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 eeb9bda57..70db75379 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-12 Vladimir Serbinenko + + Fix bug introduced by previous commit. + + * grub-core/boot/i386/pc/startup_raw.S: Compute RS start correctly. + 2011-11-12 Vladimir Serbinenko 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 4820e3442..09b6fed76 100644 --- 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)