From db0d3aeed9a9b6bcbc0c340949a9fa65ce59002d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 18 Feb 2020 19:58:35 +0000 Subject: [PATCH] BACKPORT: arm64: kernel: Convert to modern annotations for assembly data This backport excludes the changes to entry.S due to unresolvable merge conflicts. They are not needed as no symbols there are exported. The changes to head.S merged cleanly. In an effort to clarify and simplify the annotation of assembly functions in the kernel new macros have been introduced. These include specific annotations for the start and end of data, update symbols for data to use these. Bug: 352610488 Change-Id: I53ed408ccd7bc96af9221a9ba7ed4450ffcd6299 Signed-off-by: Mark Brown Signed-off-by: Catalin Marinas (cherry picked from commit a5d4420b26b5068a98ce75210b07d2e083f5f691) Signed-off-by: Giuliano Procida --- arch/arm64/kernel/head.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 23a4b533de90..e482c68e1852 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -476,8 +476,9 @@ ENDPROC(__primary_switched) */ .section ".idmap.text","awx" -ENTRY(kimage_vaddr) +SYM_DATA_START(kimage_vaddr) .quad _text - TEXT_OFFSET +SYM_DATA_END(kimage_vaddr) EXPORT_SYMBOL(kimage_vaddr) /* @@ -679,15 +680,17 @@ ENDPROC(set_cpu_boot_mode_flag) * This is not in .bss, because we set it sufficiently early that the boot-time * zeroing of .bss would clobber it. */ -ENTRY(__boot_cpu_mode) +SYM_DATA_START(__boot_cpu_mode) .long BOOT_CPU_MODE_EL2 .long BOOT_CPU_MODE_EL1 +SYM_DATA_END(__boot_cpu_mode) /* * The booting CPU updates the failed status @__early_cpu_boot_status, * with MMU turned off. */ -ENTRY(__early_cpu_boot_status) +SYM_DATA_START(__early_cpu_boot_status) .quad 0 +SYM_DATA_END(__early_cpu_boot_status) .popsection