mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-29 10:39:22 +00:00
* include/grub/misc.h (ALIGN_UP_OVERHEAD): New define.
* 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:
1 parent
90eeab76b0
commit
1a2fd1e674
8 files changed
+29
-6
No files matched your search
@@ -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++)
|
||||
|
||||
Reference in new issue
Block a user