From 49d0e47087bd60a2ceae246258d803197d105d31 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 10 Jun 2013 00:33:31 +0200
Subject: Add non-contiguous mmap support

* i386/include/mach/i386/multiboot.h (multiboot_mmap): New structure
* i386/i386at/model_dep.c (mem_size_init): Parse boot_info.mmap_addr if
available.
(init_alloc_aligned): Likewise.
---
 i386/include/mach/i386/multiboot.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'i386/include')

diff --git a/i386/include/mach/i386/multiboot.h b/i386/include/mach/i386/multiboot.h
index 7aa0b1c..8f1c47b 100644
--- a/i386/include/mach/i386/multiboot.h
+++ b/i386/include/mach/i386/multiboot.h
@@ -175,6 +175,16 @@ struct AddrRangeDesc
   /* unspecified optional padding... */
 };
 
+struct multiboot_mmap
+{
+  unsigned long size;
+  unsigned long long BaseAddr;
+  unsigned long long Length;
+  unsigned long Type;
+
+  /* unspecified optional padding... */
+};
+
 /* usable memory "Type", all others are reserved.  */
 #define MB_ARD_MEMORY       1
 
-- 
cgit v1.2.3