* grub-core/mmap/i386/pc/mmap.c (malloc_hook):

	Allocate in multiples of 16 to avoid adding a few bytes free region the
	windows bugs upon.

diff --git a/ChangeLog b/ChangeLog
index ce0ae4c713bce9356bf89ff64c56ca6416b3f390..b8013b6e370753b966b427b1f975590aac16f253 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/mmap/i386/pc/mmap.c (malloc_hook):
+       Allocate in multiples of 16 to avoid adding a few bytes free region the
+       windows bugs upon.
+
 2012-06-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/i386/pc/drivemap.c (install_int13_handler):

diff --git a/grub-core/mmap/i386/pc/mmap.c b/grub-core/mmap/i386/pc/mmap.c
index 7f170b65d7eef521c2647b12900a815eec1134c4..12ae4a4a08d17861d953e39ad1dabbb516a1c5c2 100644 (file)
--- a/grub-core/mmap/i386/pc/mmap.c
+++ b/grub-core/mmap/i386/pc/mmap.c
@@ -171,7 +171,7 @@ malloc_hook (void)
 
   reentry = 1;
   hooktarget
-    = grub_mmap_malign_and_register (16, hooksize, &mmapregion,
+    = grub_mmap_malign_and_register (16, ALIGN_UP (hooksize, 16), &mmapregion,
                                     GRUB_MEMORY_RESERVED,
                                     GRUB_MMAP_MALLOC_LOW);
   reentry = 0;