From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 15 Jun 2021 13:15:26 +0000 (+0200)
Subject: x86: move .altinstr_replacement past _einittext
X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~432
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=93c5f98296fc78de79d621418a1e62fd413e73d1;p=xen.git

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 <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

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);