Skip to content

Commit b618d31

Browse files
ardbiesheuvelIngo Molnar
authored and
Ingo Molnar
committed
x86/boot: Drop references to startup_64
The x86 boot image generation tool assign a default value to startup_64 and subsequently parses the actual value from zoffset.h but it never actually uses the value anywhere. So remove this code. This change has no impact on the resulting bzImage binary. Signed-off-by: Ard Biesheuvel <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7448e8e commit b618d31

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

arch/x86/boot/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
8989

9090
SETUP_OBJS = $(addprefix $(obj)/,$(setup-y))
9191

92-
sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p'
92+
sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p'
9393

9494
quiet_cmd_zoffset = ZOFFSET $@
9595
cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@

arch/x86/boot/tools/build.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ static unsigned long efi64_stub_entry;
6060
static unsigned long efi_pe_entry;
6161
static unsigned long efi32_pe_entry;
6262
static unsigned long kernel_info;
63-
static unsigned long startup_64;
6463
static unsigned long _end;
6564

6665
/*----------------------------------------------------------------------*/
@@ -264,7 +263,6 @@ static void efi_stub_defaults(void)
264263
efi_pe_entry = 0x10;
265264
#else
266265
efi_pe_entry = 0x210;
267-
startup_64 = 0x200;
268266
#endif
269267
}
270268

@@ -340,7 +338,6 @@ static void parse_zoffset(char *fname)
340338
PARSE_ZOFS(p, efi_pe_entry);
341339
PARSE_ZOFS(p, efi32_pe_entry);
342340
PARSE_ZOFS(p, kernel_info);
343-
PARSE_ZOFS(p, startup_64);
344341
PARSE_ZOFS(p, _end);
345342

346343
p = strchr(p, '\n');

0 commit comments

Comments
 (0)