2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>

	* doc/multiboot.texi: Define NVS and ACPI memory types.
	* doc/multiboot.h (MULTIBOOT_MEMORY_ACPI_RECLAIMABLE): New definition.
	(MULTIBOOT_MEMORY_NVS): Likewise.

diff --git a/ChangeLog b/ChangeLog
index cdc8bb79bd2da3a42776473dd9fb3c30c0178f40..0966aaddaf34a7b5ef3793fca7ce9783d6f6b61d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * doc/multiboot.texi: Define NVS and ACPI memory types.
+       * doc/multiboot.h (MULTIBOOT_MEMORY_ACPI_RECLAIMABLE): New definition.
+       (MULTIBOOT_MEMORY_NVS): Likewise.
+
 2010-01-15  Robert Millan  <rmh.grub@aybabtu.com>
 
        * doc/boot.S: Slight adjustment to make makeinfo happy.

diff --git a/doc/multiboot.h b/doc/multiboot.h
index 686a6b4c6e48cb6c8d61b8307e1af46924673383..176593116a08c4edd1b02040d4c284b84073d0fd 100644 (file)
--- a/doc/multiboot.h
+++ b/doc/multiboot.h
@@ -236,6 +236,8 @@ struct multiboot_mmap_entry
   multiboot_uint64_t len;
 #define MULTIBOOT_MEMORY_AVAILABLE             1
 #define MULTIBOOT_MEMORY_RESERVED              2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+#define MULTIBOOT_MEMORY_NVS                    4
   multiboot_uint32_t type;
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;

diff --git a/doc/multiboot.texi b/doc/multiboot.texi
index f95b7945eeb6957f24429bf90278dc482bfc9f77..96809b1ccbfcdc06aa4900e05950a468018d8b16 100644 (file)
--- a/doc/multiboot.texi
+++ b/doc/multiboot.texi
@@ -817,7 +817,9 @@ where @samp{size} is the size of the associated structure in bytes, which
 can be greater than the minimum of 20 bytes. @samp{base_addr} is the
 starting address. @samp{length} is the size of the memory region in bytes.
 @samp{type} is the variety of address range represented, where a
-value of 1 indicates available @sc{ram}, and all other values currently
+value of 1 indicates available @sc{ram}, value of 3 indicates usable memory
+holding ACPI information, value of 4 indicates reserved memory which needs to
+be preserved on hibernation and all other values currently
 indicated a reserved area.
 
 The map provided is guaranteed to list all standard @sc{ram} that should