Commit 2e765c02 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

x86/boot: Grab kernel_info offset from zoffset header directly 



Instead of parsing zoffset.h and poking the kernel_info offset value
into the header from the build tool, just grab the value directly in the
asm file that describes this header.

This change has no impact on the resulting bzImage binary.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230915171623.655440-11-ardb@google.com
parent b618d31f

arch/x86/boot/header.S

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr 


init_size:		.long INIT_SIZE		# kernel initialization size

handover_offset:	.long 0			# Filled in by build.c

kernel_info_offset:	.long 0			# Filled in by build.c

kernel_info_offset:	.long ZO_kernel_info



# End of setup header #####################################################

arch/x86/boot/tools/build.c

+0 −4
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static unsigned long efi32_stub_entry; 
static unsigned long efi64_stub_entry;

static unsigned long efi_pe_entry;

static unsigned long efi32_pe_entry;

static unsigned long kernel_info;

static unsigned long _end;



/*----------------------------------------------------------------------*/
@@ -337,7 +336,6 @@ static void parse_zoffset(char *fname) 
		PARSE_ZOFS(p, efi64_stub_entry);

		PARSE_ZOFS(p, efi_pe_entry);

		PARSE_ZOFS(p, efi32_pe_entry);

		PARSE_ZOFS(p, kernel_info);

		PARSE_ZOFS(p, _end);



		p = strchr(p, '\n');
@@ -419,8 +417,6 @@ int main(int argc, char ** argv) 
	update_pecoff_text(setup_sectors * 512, i + (sys_size * 16));



	efi_stub_entry_update();

	/* Update kernel_info offset. */

	put_unaligned_le32(kernel_info, &buf[0x268]);



	crc = partial_crc32(buf, i, crc);

	if (fwrite(buf, 1, i, dest) != i)