diff --git a/hypervisor/arch/x86/boot/cpu_primary.S b/hypervisor/arch/x86/boot/cpu_primary.S index df0bb4a91..473b053b8 100644 --- a/hypervisor/arch/x86/boot/cpu_primary.S +++ b/hypervisor/arch/x86/boot/cpu_primary.S @@ -76,7 +76,7 @@ address_tag_start: .short 0 .long address_tag_end - address_tag_start .long mb2_header_start /* address corresponding to the beginning of the Multiboot2 header */ - .long _ld_ram_start /* load_addr: load from the binary's beginning */ + .long ld_ram_start /* load_addr: load from the binary's beginning */ /* * load_end_addr: this includes .bss so that boot loader could reserve the * memory that .bss occupies to avoid placing boot modules or other data in that area. @@ -84,7 +84,7 @@ address_tag_start: * However, the boot loader is supposed not to actually load the .bss section because * it's beyond the scope of acrn.bin */ - .long _ld_ram_end + .long ld_ram_end .long 0 /* bss_end_addr, don't ask boot loader to clear .bss */ address_tag_end: diff --git a/hypervisor/arch/x86/mmu.c b/hypervisor/arch/x86/mmu.c index c5248d31c..17ff69ffb 100644 --- a/hypervisor/arch/x86/mmu.c +++ b/hypervisor/arch/x86/mmu.c @@ -255,7 +255,7 @@ void init_paging(void) const struct abi_mmap *p_mmap = abi->mmap_entry; pr_dbg("HV MMU Initialization"); - hv_ram_size = (uint64_t)(&_ld_ram_end - &_ld_ram_start); + hv_ram_size = (uint64_t)(&ld_ram_end - &ld_ram_start); init_sanitized_page((uint64_t *)sanitized_page, hva2hpa_early(sanitized_page)); diff --git a/hypervisor/bsp/ld/link_ram.ld.in b/hypervisor/bsp/ld/link_ram.ld.in index 7f27d1b87..803fe93a4 100644 --- a/hypervisor/bsp/ld/link_ram.ld.in +++ b/hypervisor/bsp/ld/link_ram.ld.in @@ -13,7 +13,7 @@ SECTIONS { .boot : { - _ld_ram_start = . ; + ld_ram_start = . ; KEEP(*(multiboot_header)) ; } > ram @@ -99,5 +99,5 @@ SECTIONS } > ram . = ALIGN(0x200000) ; - _ld_ram_end = . ; + ld_ram_end = . ; } diff --git a/hypervisor/include/arch/x86/asm/boot/ld_sym.h b/hypervisor/include/arch/x86/asm/boot/ld_sym.h index 6c2e3327b..758202ba0 100644 --- a/hypervisor/include/arch/x86/asm/boot/ld_sym.h +++ b/hypervisor/include/arch/x86/asm/boot/ld_sym.h @@ -14,7 +14,7 @@ extern uint8_t ld_entry_end; extern const uint8_t ld_trampoline_load; extern uint8_t ld_trampoline_start; extern uint8_t ld_trampoline_end; -extern uint8_t _ld_ram_start; -extern uint8_t _ld_ram_end; +extern uint8_t ld_ram_start; +extern uint8_t ld_ram_end; #endif /* LD_SYM_H */