From efbeefe90fc91a9bd7aa08d88b13499eeabdbe72 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sun, 3 Jun 2012 18:00:37 +0200 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ grub-core/mmap/i386/pc/mmap.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ce0ae4c71..b8013b6e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-06-03 Vladimir Serbinenko + + * 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 * 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 7f170b65d..12ae4a4a0 100644 --- 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;