sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-01-22 03:32:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

[initrd] Rename bzimage_align() to initrd_align()

Browse Source 
Alignment of initrd lengths is applicable to all Linux kernels, not
just those in the x86 bzImage format.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-05-22 13:41:21 +01:00
parent 9231d8c952
commit 029c7c4178
5 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/arch/x86/image/bzimage.c
View File

@@ -316,17 +316,6 @@ static void bzimage_set_cmdline ( struct image *image,
image->name, rm_cmdline );
}
/**
* Align initrd length
*
* @v len Length
* @ret len Length rounded up to INITRD_ALIGN
*/
static inline size_t bzimage_align ( size_t len ) {
return ( ( len + INITRD_ALIGN - 1 ) & ~( INITRD_ALIGN - 1 ) );
}
/**
* Load initrd
*
@@ -407,7 +396,7 @@ static int bzimage_check_initrds ( struct image *image,
/* Calculate length */
len += bzimage_load_initrd ( image, initrd, NULL );
len = bzimage_align ( len );
len = initrd_align ( len );
DBGC ( image, "bzImage %s initrd %s from [%#08lx,%#08lx)%s%s\n",
image->name, initrd->name, virt_to_phys ( initrd->data ),
@@ -467,7 +456,7 @@ static void bzimage_load_initrds ( struct image *image,
for_each_image ( initrd ) {
if ( virt_to_phys ( initrd->data ) >= top ) {
top = ( virt_to_phys ( initrd->data ) +
bzimage_align ( initrd->len ) );
initrd_align ( initrd->len ) );
}
}
@@ -491,7 +480,7 @@ static void bzimage_load_initrds ( struct image *image,
if ( other == initrd )
offset = 0;
offset += bzimage_load_initrd ( image, other, NULL );
offset = bzimage_align ( offset );
offset = initrd_align ( offset );
}
/* Load initrd at this address */