2008-06-06 Robert Millan <rmh@aybabtu.com>

        Ensure GRUB_KERNEL_MACHINE_DATA_END is always consistent with the
        rest of GRUB, and breakage doesn't happen if its value were modified.

        * include/grub/i386/pc/kernel.h (GRUB_KERNEL_MACHINE_RAW_SIZE):
        Redefine as an offset from `GRUB_KERNEL_MACHINE_DATA_END' instead of
        a constant (same value).
        * kern/i386/pc/startup.S: Replace hardcoded `0x50' with
        `GRUB_KERNEL_MACHINE_DATA_END' (same value).

diff --git a/ChangeLog b/ChangeLog
index 2f56c51a79f68e3e3fa10c4b7a7e3fab1515eed1..d1485af22212c93d7b9e15e2cfd6ef5f0b78f2d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-06-06  Robert Millan  <rmh@aybabtu.com>
+
+       Ensure GRUB_KERNEL_MACHINE_DATA_END is always consistent with the
+       rest of GRUB, and breakage doesn't happen if its value were modified.
+
+       * include/grub/i386/pc/kernel.h (GRUB_KERNEL_MACHINE_RAW_SIZE):
+       Redefine as an offset from `GRUB_KERNEL_MACHINE_DATA_END' instead of
+       a constant (same value).
+       * kern/i386/pc/startup.S: Replace hardcoded `0x50' with
+       `GRUB_KERNEL_MACHINE_DATA_END' (same value).
+
 2008-06-06  Robert Millan  <rmh@aybabtu.com>
 
        * util/biosdisk.c (open_device): Do not modify sector offset when

diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index 43a8d5b6ed3f2f8cdac6500601385a35392d2844..13e88735494a3e85653592be0732fc146c85c964 100644 (file)
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -44,7 +44,7 @@
 #define GRUB_KERNEL_MACHINE_DATA_END           0x50
 
 /* The size of the first region which won't be compressed.  */
-#define GRUB_KERNEL_MACHINE_RAW_SIZE           0x4A0
+#define GRUB_KERNEL_MACHINE_RAW_SIZE           (GRUB_KERNEL_MACHINE_DATA_END + 0x450)
 
 #ifndef ASM_FILE
 

diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index ebb98fe60b60ba4bfca37b3dd1f45386c5fd12ac..9542978912f8ce51b9c4496fda60e23c401d5e6e 100644 (file)
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -105,7 +105,7 @@ VARIABLE(grub_prefix)
         *  Leave some breathing room for the prefix.
         */
 
-       . = EXT_C(start) + 0x50
+       . = EXT_C(start) + GRUB_KERNEL_MACHINE_DATA_END
 
 /*
  * Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).