vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
cached mmap_size, so that this works correctly when called multiple
times.
Reported by: Daniel Kahn Gillmor.  Should fix Debian bug #616638.
This commit is contained in:
Colin Watson 2011-03-09 17:38:31 +00:00
parent 83a3c48d37
commit be1a7ce0cf
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2011-03-09 Colin Watson <cjwatson@ubuntu.com>
* docs/grub.texi (Simple configuration): Tidy up formatting. * docs/grub.texi (Simple configuration): Tidy up formatting.

3
grub-core/loader/i386/linux.c
View file

@ -136,7 +136,8 @@ find_efi_mmap_size (void)
later, and EFI itself may allocate more. */ later, and EFI itself may allocate more. */
mmap_size += (1 << 12); mmap_size += (1 << 12);
return page_align (mmap_size); mmap_size = page_align (mmap_size);
return mmap_size;
} }
#endif #endif