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

* include/grub/misc.h (ALIGN_UP_OVERHEAD): New define.

Browse source 
* grub-core/loader/i386/linux.c (grub_cmd_initrd): Align initrds at 4.
	* grub-core/loader/i386/pc/linux.c (grub_cmd_initrd): Likewise.
	* grub-core/loader/ia64/efi/linux.c (grub_cmd_initrd): Likewise.
	* grub-core/loader/mips/linux.c (grub_cmd_initrd): Likewise.
	* grub-core/loader/powerpc/ieee1275/linux.c (grub_cmd_initrd): Likewise.
	* grub-core/loader/sparc64/ieee1275/linux.c (grub_cmd_initrd): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-05 01:17:55 +01:00
parent 90eeab76b0
commit 1a2fd1e674
8 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/loader/ia64/efi/linux.c
View file

@ -597,7 +597,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
if (! files[i])
goto fail;
nfiles++;
initrd_size += grub_file_size (files[i]);
initrd_size += ALIGN_UP (grub_file_size (files[i]), 4);
grub_dprintf ("linux", "File %d: %s\n", i, argv[i]);
}
@ -624,6 +624,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail;
}
ptr += cursize;
grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4));
ptr += ALIGN_UP_OVERHEAD (cursize, 4);
}
fail:
for (i = 0; i < nfiles; i++)