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

* grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the

Browse source 
initrd size to addr_min, since the initrd will be allocated after
this address.
This commit is contained in:
Colin Watson 2013-01-20 23:03:35 +00:00
parent f41e08dbcd
commit 6a0debbd91
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-01-20 Colin Watson <cjwatson@ubuntu.com>
* grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the
initrd size to addr_min, since the initrd will be allocated after
this address.
2013-01-20 Andrey Borzenkov <arvidjaar@gmail.com>
* conf/Makefile.common: Fix autogen rules to pass definition

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

@ -1115,8 +1115,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
worse than that of Linux 2.3.xx, so avoid the last 64kb. */
addr_max -= 0x10000;
addr_min = (grub_addr_t) prot_mode_target + prot_init_space
+ page_align (size);
addr_min = (grub_addr_t) prot_mode_target + prot_init_space;
/* Put the initrd as high as possible, 4KiB aligned. */
addr = (addr_max - size) & ~0xFFF;