* include/grub/offsets.h (GRUB_KERNEL_I386_PC_RAW_SIZE): The

previous patch increased the size of the RS code by 20 bytes (at
least with gcc-4.4), so increase this by 20 bytes to match.
(GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4c7225bc5c232a7690c2cd688cd5f3f145ab873a..27e2aee97145e977366956999affeef5c83f6389 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-21  Colin Watson  <cjwatson@ubuntu.com>
+
+       * include/grub/offsets.h (GRUB_KERNEL_I386_PC_RAW_SIZE): The
+       previous patch increased the size of the RS code by 20 bytes (at
+       least with gcc-4.4), so increase this by 20 bytes to match.
+       (GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART): Likewise.
+
 2010-12-21  Colin Watson  <cjwatson@ubuntu.com>
 
        * grub-core/lib/reed_solomon.c (gauss_solve): Fix size of standalone

diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index b096abf372cd2f2057463c4154bf1ca7d696a91c..817372b69112ff654c72a8132453de72c93d04d6 100644 (file)
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -38,9 +38,9 @@
 #define GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY    0x1c
 
 /* The size of the first region which won't be compressed.  */
-#define GRUB_KERNEL_I386_PC_RAW_SIZE           0xc90
+#define GRUB_KERNEL_I386_PC_RAW_SIZE           0xca4
 
-#define GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART 0x6f8
+#define GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART 0x70c
 
 /* The offset of GRUB_PREFIX.  */
 #define GRUB_KERNEL_I386_PC_PREFIX             GRUB_KERNEL_I386_PC_RAW_SIZE