diff mbox series

[kvm-unit-tests,v2,13/23] arm/arm64: Rename etext to _etext

Message ID 20220506205605.359830-14-nikos.nikoleris@arm.com (mailing list archive)
State New, archived
Headers show
Series EFI and ACPI support for arm64 | expand

Commit Message

Nikos Nikoleris May 6, 2022, 8:55 p.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>
---
 lib/arm/setup.c | 4 ++--
 arm/flat.lds    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Ricardo Koller June 21, 2022, 4:42 p.m. UTC | #1 
On Fri, May 06, 2022 at 09:55:55PM +0100, Nikos Nikoleris wrote:
> 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>
> ---
>  lib/arm/setup.c | 4 ++--
>  arm/flat.lds    | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/arm/setup.c b/lib/arm/setup.c
> index 3c24c75..2d67292 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) }
> -- 
> 2.25.1
> 

Reviewed-by: Ricardo Koller <ricarkol@google.com>
diff mbox series

Patch

diff --git a/lib/arm/setup.c b/lib/arm/setup.c
index 3c24c75..2d67292 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) }