diff mbox series

[kvm-unit-tests,v3,16/27] arm/arm64: Rename etext to _etext

Message ID	20220630100324.3153655-17-nikos.nikoleris@arm.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Nikos Nikoleris <nikos.nikoleris@arm.com> To: kvm@vger.kernel.org Cc: Andrew Jones <drjones@redhat.com>, andrew.jones@linux.dev, pbonzini@redhat.com, jade.alglave@arm.com, alexandru.elisei@arm.com, ricarkol@google.com Subject: [kvm-unit-tests PATCH v3 16/27] arm/arm64: Rename etext to _etext Date: Thu, 30 Jun 2022 11:03:13 +0100 Message-Id: <20220630100324.3153655-17-nikos.nikoleris@arm.com> In-Reply-To: <20220630100324.3153655-1-nikos.nikoleris@arm.com> References: <20220630100324.3153655-1-nikos.nikoleris@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	EFI and ACPI support for arm64 \| expand [kvm-unit-tests,v3,00/27] EFI and ACPI support for arm64 [kvm-unit-tests,v3,01/27] lib: Fix style for acpi.{c,h} [kvm-unit-tests,v3,02/27] x86: Avoid references to fields of ACPI tables [kvm-unit-tests,v3,03/27] lib: Ensure all struct definition for ACPI tables are packed [kvm-unit-tests,v3,04/27] lib: Add support for the XSDT ACPI table [kvm-unit-tests,v3,05/27] lib: Extend the definition of the ACPI table FADT [kvm-unit-tests,v3,06/27] devicetree: Check if fdt is NULL before returning that a DT is available [kvm-unit-tests,v3,07/27] arm/arm64: Add support for setting up the PSCI conduit through ACPI [kvm-unit-tests,v3,08/27] arm/arm64: Add support for discovering the UART through ACPI [kvm-unit-tests,v3,09/27] arm/arm64: Add support for timer initialization through ACPI [kvm-unit-tests,v3,10/27] arm/arm64: Add support for cpu initialization through ACPI [kvm-unit-tests,v3,11/27] arm/arm64: Add support for gic initialization through ACPI [kvm-unit-tests,v3,12/27] lib/printf: Support for precision modifier in printf [kvm-unit-tests,v3,13/27] lib/printf: Add support for printing wide strings [kvm-unit-tests,v3,14/27] lib/efi: Add support for getting the cmdline [kvm-unit-tests,v3,15/27] arm/arm64: mmu_disable: Clean and invalidate before disabling [kvm-unit-tests,v3,16/27] arm/arm64: Rename etext to _etext [kvm-unit-tests,v3,17/27] lib: Avoid ms_abi for calls related to EFI on arm64 [kvm-unit-tests,v3,18/27] arm64: Add a new type of memory type flag MR_F_RESERVED [kvm-unit-tests,v3,19/27] arm/arm64: Add a setup sequence for systems that boot through EFI [kvm-unit-tests,v3,20/27] arm64: Copy code from GNU-EFI [kvm-unit-tests,v3,21/27] arm64: Change GNU-EFI imported file to use defined types [kvm-unit-tests,v3,22/27] arm64: Use code from the gnu-efi when booting with EFI [kvm-unit-tests,v3,23/27] lib: Avoid external dependency in libelf [kvm-unit-tests,v3,24/27] x86: Move x86_64-specific EFI CFLAGS to x86_64 Makefile [kvm-unit-tests,v3,25/27] arm64: Add support for efi in Makefile [kvm-unit-tests,v3,26/27] lib: arm: Print test exit status [kvm-unit-tests,v3,27/27] arm64: Add an efi/run script

Commit Message

Nikos Nikoleris June 30, 2022, 10:03 a.m. UTC

From: Andrew Jones <drjones@redhat.com>

Rename etext to the more popular _etext allowing different linker
scripts to more easily be used.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Ricardo Koller <ricarkol@google.com>
---
 lib/arm/setup.c | 4 ++--
 arm/flat.lds    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/lib/arm/setup.c b/lib/arm/setup.c
index 3612991..13513d0 100644
--- a/lib/arm/setup.c
+++ b/lib/arm/setup.c
@@ -34,7 +34,7 @@ 
 #define NR_EXTRA_MEM_REGIONS	16
 #define NR_INITIAL_MEM_REGIONS	(MAX_DT_MEM_REGIONS + NR_EXTRA_MEM_REGIONS)
 
-extern unsigned long etext;
+extern unsigned long _etext;
 
 char *initrd;
 u32 initrd_size;
@@ -140,7 +140,7 @@  unsigned int mem_region_get_flags(phys_addr_t paddr)
 
 static void mem_regions_add_assumed(void)
 {
-	phys_addr_t code_end = (phys_addr_t)(unsigned long)&etext;
+	phys_addr_t code_end = (phys_addr_t)(unsigned long)&_etext;
 	struct mem_region *r;
 
 	r = mem_region_find(code_end - 1);
diff --git a/arm/flat.lds b/arm/flat.lds
index 47fcb64..9016ac9 100644
--- a/arm/flat.lds
+++ b/arm/flat.lds
@@ -27,7 +27,7 @@  SECTIONS
     PROVIDE(_text = .);
     .text : { *(.init) *(.text) *(.text.*) }
     . = ALIGN(64K);
-    PROVIDE(etext = .);
+    PROVIDE(_etext = .);
 
     PROVIDE(reloc_start = .);
     .rela.dyn : { *(.rela.dyn) }