From 93c5f98296fc78de79d621418a1e62fd413e73d1 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 15 Jun 2021 15:15:26 +0200 Subject: [PATCH] x86: move .altinstr_replacement past _einittext This section's contents do not represent part of actual hypervisor text, so shouldn't be included in what is_kernel_inittext() or (while still booting) is_active_kernel_text() report "true" for. Keep them in .init.text though, as there's no real reason to have a separate section for this in the final binary. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 34f647a44e..9c6c1c8005 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -185,13 +185,13 @@ SECTIONS #endif _sinittext = .; *(.init.text) + _einittext = .; /* * Here are the replacement instructions. The linker sticks them * as binary blobs. The .altinstructions has enough data to get * the address and the length of them to patch the kernel safely. */ *(.altinstr_replacement) - _einittext = .; #ifdef EFI /* EFI wants to merge all of .init.* ELF doesn't. */ . = ALIGN(SMP_CACHE_BYTES); -- 2.30.2