Commit c6ac4c18 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, boot: correct the calculation of ZO_INIT_SIZE 



Correct the calculation of ZO_INIT_SIZE (the amount of memory we need
during decompression).  One symbol (ZO_startup_32) was missing from
zoffset.h, and another (ZO_z_extract_offset) was misspelled.

[ Impact: build fix ]

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent c4f68236

arch/x86/boot/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ targets += voffset.h 
$(obj)/voffset.h: vmlinux FORCE

$(obj)/voffset.h: vmlinux FORCE

	$(call if_changed,voffset)

	$(call if_changed,voffset)





sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'

sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p'





quiet_cmd_zoffset = ZOFFSET $@

quiet_cmd_zoffset = ZOFFSET $@

      cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@

      cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@

arch/x86/boot/header.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -226,7 +226,7 @@ setup_data: .quad 0 # 64-bit physical pointer to 




pref_address:		.quad LOAD_PHYSICAL_ADDR	# preferred load addr

pref_address:		.quad LOAD_PHYSICAL_ADDR	# preferred load addr





#define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_extract_offset)

#define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)

#define VO_INIT_SIZE	(VO__end - VO__text)

#define VO_INIT_SIZE	(VO__end - VO__text)

#if ZO_INIT_SIZE > VO_INIT_SIZE

#if ZO_INIT_SIZE > VO_INIT_SIZE

#define INIT_SIZE ZO_INIT_SIZE

#define INIT_SIZE ZO_INIT_SIZE