| Message ID | 20200301230537.2247550-4-nivedita@alum.mit.edu |
|---|---|
| State | New |
| Headers | show |
| Series | Minimize the need to move the kernel in the EFI stub | expand |
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 4ee25e28996f..0d8d2cb28fd9 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -138,10 +138,12 @@ optional_header: #endif extra_header_fields: + # PE specification requires ImageBase to be 64k-aligned + .set ImageBase, (LOAD_PHYSICAL_ADDR+0xffff) & ~0xffff #ifdef CONFIG_X86_32 - .long 0 # ImageBase + .long ImageBase # ImageBase #else - .quad 0 # ImageBase + .quad ImageBase # ImageBase #endif .long 0x20 # SectionAlignment .long 0x20 # FileAlignment
Store the kernel's link address as ImageBase in the PE header. Note that the PE specification requires the ImageBase to be 64k aligned. The preferred address should almost always satisfy that, except for 32-bit kernel if the configuration has been customized. Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> --- arch/x86/boot/header.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)