2008-11-12 Robert Millan <rmh@aybabtu.com>

        Make loader/i386/linux.c buildable on i386-pc (although disabled).

        * include/grub/i386/pc/init.h: Include `<grub/machine/memory.h>'.
        (struct grub_machine_mmap_entry, grub_machine_mmap_iterate): Move
        from here ...
        * include/grub/i386/pc/memory.h: ... to here.

diff --git a/ChangeLog b/ChangeLog
index 1f92fa62fdbfbf49de9e93fa9ba898e8116b1b6a..ddba3f0521479ff71f4ec795139135e51d1cebb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-12  Robert Millan  <rmh@aybabtu.com>
+
+       Make loader/i386/linux.c buildable on i386-pc (although disabled).
+
+       * include/grub/i386/pc/init.h: Include `<grub/machine/memory.h>'.
+       (struct grub_machine_mmap_entry, grub_machine_mmap_iterate): Move
+       from here ...
+       * include/grub/i386/pc/memory.h: ... to here.
+
 2008-11-12  Robert Millan  <rmh@aybabtu.com>
 
        Fix build problems on i386-ieee1275 and *-efi (introduced by vga_text

diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 1a031db1eb56a0c132c86c41e843681bfcb8b09a..f18a0dae48f9e9507a589e4cee395173f7a10a25 100644 (file)
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -21,6 +21,7 @@
 
 #include <grub/types.h>
 #include <grub/symbol.h>
+#include <grub/machine/memory.h>
 
 /* Get the memory size in KB. If EXTENDED is zero, return conventional
    memory, otherwise return extended memory.  */
@@ -30,24 +31,11 @@ grub_uint16_t grub_get_memsize (int extended);
    in 1KB parts, and upper 16 bits are above 16MB in 64KB parts.  */
 grub_uint32_t grub_get_eisa_mmap (void);
 
-struct grub_machine_mmap_entry
-{
-  grub_uint32_t size;
-  grub_uint64_t addr;
-  grub_uint64_t len;
-#define GRUB_MACHINE_MEMORY_AVAILABLE  1
-#define GRUB_MACHINE_MEMORY_RESERVED   2
-  grub_uint32_t type;
-} __attribute__((packed));
-
 /* Get a memory map entry. Return next continuation value. Zero means
    the end.  */
 grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry,
                                   grub_uint32_t cont);
 
-void EXPORT_FUNC(grub_machine_mmap_iterate)
-     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
-
 /* Turn on/off Gate A20.  */
 void grub_gate_a20 (int on);
 

diff --git a/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
index a3e3ed793764172673c19cdf061ab652458a9a2b..6a4830788fbf74f679c888693ddf776f324c095a 100644 (file)
--- a/include/grub/i386/pc/memory.h
+++ b/include/grub/i386/pc/memory.h
@@ -84,6 +84,19 @@ extern grub_size_t EXPORT_VAR(grub_lower_mem);
 
 extern grub_size_t EXPORT_VAR(grub_upper_mem);
 
+struct grub_machine_mmap_entry
+{
+  grub_uint32_t size;
+  grub_uint64_t addr;
+  grub_uint64_t len;
+#define GRUB_MACHINE_MEMORY_AVAILABLE  1
+#define GRUB_MACHINE_MEMORY_RESERVED   2
+  grub_uint32_t type;
+} __attribute__((packed));
+
+void EXPORT_FUNC(grub_machine_mmap_iterate)
+     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+
 #endif
 
 #endif /* ! GRUB_MEMORY_MACHINE_HEADER */