2009-03-08 Robert Millan <rmh@aybabtu.com>

        Make loader/i386/linux.c usable on i386-pc again.

        * kern/i386/pc/init.c (grub_machine_init): Disable addition of low
        memory to heap.
        * loader/i386/linux.c [GRUB_MACHINE_PCBIOS] (allocate_pages): Remove
        `#error' stanza.

diff --git a/ChangeLog b/ChangeLog
index 2add040299329619efef87e83cca19e64fcc229d..150e6d526a45fdb58f8184b4821a7f895b37d59c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-08  Robert Millan  <rmh@aybabtu.com>
+
+       Make loader/i386/linux.c usable on i386-pc again.
+
+       * kern/i386/pc/init.c (grub_machine_init): Disable addition of low
+       memory to heap.
+       * loader/i386/linux.c [GRUB_MACHINE_PCBIOS] (allocate_pages): Remove
+       `#error' stanza.
+
 2009-03-07  Bean  <bean123ch@gmail.com>
 
        * loader/i386/efi/linux.c (grub_rescue_cmd_initrd): Fix a bug in initrd

diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index c604e93522d853000941c03f4b534b1091afd6ea..1d6d22f96840bd76b6e6e782e89e22da91ad9ddc 100644 (file)
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -148,10 +148,15 @@ grub_machine_init (void)
   grub_gate_a20 (1);
 #endif
 
+/* FIXME: This prevents loader/i386/linux.c from using low memory.  When our
+   heap implements support for requesting a chunk in low memory, this should
+   no longer be a problem.  */
+#if 0
   /* Add the lower memory into free memory.  */
   if (grub_lower_mem >= GRUB_MEMORY_MACHINE_RESERVED_END)
     add_mem_region (GRUB_MEMORY_MACHINE_RESERVED_END,
                    grub_lower_mem - GRUB_MEMORY_MACHINE_RESERVED_END);
+#endif
   
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index a5fbf041ed45d7b5e95bbd39849afbbfdd936526..1c87c919feb0e25e44c87a2a90a09e713948405e 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -143,9 +143,8 @@ allocate_pages (grub_size_t prot_size)
   real_mode_mem = 0;
   prot_mode_mem = 0;
   
-#ifdef GRUB_MACHINE_PCBIOS
-#error i386-pc port adds lower memory to heap, which collides with `real_mode_mem' allocation below
-#endif
+  /* FIXME: Should request low memory from the heap when this feature is
+     implemented.  */
 
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)