* grub-core/kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Pass

	unknown types through.

diff --git a/ChangeLog b/ChangeLog
index 3c9c46d89c2c1499fb74c1eb68b35f56c3b22612..09761cec48d7d6308a8f9d87d10ba3f64e3d5b5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Pass
+       unknown types through.
+
 2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/osdep/unix/getroot.c (grub_util_check_block_device): Remove.

diff --git a/grub-core/kern/i386/pc/mmap.c b/grub-core/kern/i386/pc/mmap.c
index 7e5feea1aa3f6a78cf0ceb3910680ef5d01e806e..b34cbad03797dda2bb8ab8b70e52d82e8deb1ee8 100644 (file)
--- a/grub-core/kern/i386/pc/mmap.c
+++ b/grub-core/kern/i386/pc/mmap.c
@@ -156,8 +156,7 @@ grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
        if (hook (entry->addr, entry->len,
                  /* GRUB mmaps have been defined to match with the E820 definition.
                     Therefore, we can just pass type through.  */
-                 ((entry->type <= GRUB_MACHINE_MEMORY_BADRAM) && (entry->type >= GRUB_MACHINE_MEMORY_AVAILABLE)) ? entry->type : GRUB_MEMORY_RESERVED,
-                 hook_data))
+                 entry->type, hook_data))
          break;
 
        if (! cont)