* grub-core/loader/i386/linux.c (find_efi_mmap_size): Page-align

cached mmap_size, so that this works correctly when called multiple
times.
Reported by: Daniel Kahn Gillmor.  Should fix Debian bug #616638.

diff --git a/ChangeLog b/ChangeLog
index 103706af087134a79470bb14eb1e6860b19514d9..0406cf91f69ae2d57279d90696b87487e895808b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-09  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/loader/i386/linux.c (find_efi_mmap_size): Page-align
+       cached mmap_size, so that this works correctly when called multiple
+       times.
+       Reported by: Daniel Kahn Gillmor.  Should fix Debian bug #616638.
+
 2011-03-09  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub.texi (Simple configuration): Tidy up formatting.

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 80960570b0cf3a60c06031a452df9c9261ddd5d2..0178e2fd48e3b652985b26ef588a23f7f74611bf 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -136,7 +136,8 @@ find_efi_mmap_size (void)
      later, and EFI itself may allocate more.  */
   mmap_size += (1 << 12);
 
-  return page_align (mmap_size);
+  mmap_size = page_align (mmap_size);
+  return mmap_size;
 }
 
 #endif