* grub-core/loader/i386/linux.c (allocate_pages): Overwrite low memory

	boot services if we have no other choice.

diff --git a/ChangeLog b/ChangeLog
index 2749f87b57e958913b7b96129327d8bfcd8d000d..0cece185e36e75e546655dc5fee9ea8cfe5d2bc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/i386/linux.c (allocate_pages): Overwrite low memory
+       boot services if we have no other choice.
+
+2012-04-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mknetdir.in: Rename --override-directory to --directory and
+       document it.
+       * tests/util/grub-shell.in: Update to --directory.
+
 2012-04-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/zfs/zfs.c: Disable -Wstrict-aliasing.

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 8f4bd3a532c6775a93ef6ff7c4080c28cbc323d1..4c382b114092e14292e669427a2b282a63183fd6 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -259,6 +259,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
     }
 #ifdef GRUB_MACHINE_EFI
   grub_efi_mmap_iterate (hook, 1);
+  if (! real_mode_target)
+    grub_efi_mmap_iterate (hook, 0);
 #else
   grub_mmap_iterate (hook);
 #endif