From d1a14b7eb26f417c3a2da9f584930a501114113d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Tue, 19 Feb 2019 15:55:58 +0100 Subject: [PATCH] ld: Change the name of section .user_mmu_data to user_mmu_tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The arch/x86/CMakeLists.txt build scripts names five sections that are generated from .bin files. Two of them are named the same as the .bin file, and the other three are named inconsistently. To be consistent, we will rename the three that are named inconistenly to align with the two that are named as the .bin file. Being consistent simplifies the system and fosters code-reuse. This patch renames user_mmu_tables. Signed-off-by: Sebastian Bøe --- arch/x86/CMakeLists.txt | 2 +- include/arch/x86/linker.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/CMakeLists.txt b/arch/x86/CMakeLists.txt index 6cb83e4ef3c..049f6e52be1 100644 --- a/arch/x86/CMakeLists.txt +++ b/arch/x86/CMakeLists.txt @@ -195,7 +195,7 @@ if(CONFIG_X86_MMU) -I binary -B ${OUTPUT_ARCH} -O ${OUTPUT_FORMAT} - --rename-section .data=.user_mmu_data + --rename-section .data=user_mmu_tables user_mmu_tables.bin user_mmu_tables.o WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/include/arch/x86/linker.ld b/include/arch/x86/linker.ld index fefee6b0104..d5ca64886aa 100644 --- a/include/arch/x86/linker.ld +++ b/include/arch/x86/linker.ld @@ -381,7 +381,7 @@ SECTIONS KEEP(*(mmu_tables)); #ifdef CONFIG_X86_KPTI z_x86_user_pdpt = .; - KEEP(*(.user_mmu_data)); + KEEP(*(user_mmu_tables)); #endif /* CONFIG_X86_KPTI */ __mmu_tables_end = .; } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)