Commit a5d4420b authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas

arm64: kernel: Convert to modern annotations for assembly data

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.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent ebdf44a1
...@@ -859,9 +859,9 @@ SYM_CODE_END(tramp_exit_compat) ...@@ -859,9 +859,9 @@ SYM_CODE_END(tramp_exit_compat)
#ifdef CONFIG_RANDOMIZE_BASE #ifdef CONFIG_RANDOMIZE_BASE
.pushsection ".rodata", "a" .pushsection ".rodata", "a"
.align PAGE_SHIFT .align PAGE_SHIFT
.globl __entry_tramp_data_start SYM_DATA_START(__entry_tramp_data_start)
__entry_tramp_data_start:
.quad vectors .quad vectors
SYM_DATA_END(__entry_tramp_data_start)
.popsection // .rodata .popsection // .rodata
#endif /* CONFIG_RANDOMIZE_BASE */ #endif /* CONFIG_RANDOMIZE_BASE */
#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ #endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */
...@@ -983,8 +983,9 @@ NOKPROBE(__sdei_asm_exit_trampoline) ...@@ -983,8 +983,9 @@ NOKPROBE(__sdei_asm_exit_trampoline)
.popsection // .entry.tramp.text .popsection // .entry.tramp.text
#ifdef CONFIG_RANDOMIZE_BASE #ifdef CONFIG_RANDOMIZE_BASE
.pushsection ".rodata", "a" .pushsection ".rodata", "a"
__sdei_asm_trampoline_next_handler: SYM_DATA_START(__sdei_asm_trampoline_next_handler)
.quad __sdei_asm_handler .quad __sdei_asm_handler
SYM_DATA_END(__sdei_asm_trampoline_next_handler)
.popsection // .rodata .popsection // .rodata
#endif /* CONFIG_RANDOMIZE_BASE */ #endif /* CONFIG_RANDOMIZE_BASE */
#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ #endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */
......
...@@ -464,8 +464,9 @@ SYM_FUNC_END(__primary_switched) ...@@ -464,8 +464,9 @@ SYM_FUNC_END(__primary_switched)
*/ */
.section ".idmap.text","awx" .section ".idmap.text","awx"
ENTRY(kimage_vaddr) SYM_DATA_START(kimage_vaddr)
.quad _text - TEXT_OFFSET .quad _text - TEXT_OFFSET
SYM_DATA_END(kimage_vaddr)
EXPORT_SYMBOL(kimage_vaddr) EXPORT_SYMBOL(kimage_vaddr)
/* /*
...@@ -667,15 +668,17 @@ SYM_FUNC_END(set_cpu_boot_mode_flag) ...@@ -667,15 +668,17 @@ SYM_FUNC_END(set_cpu_boot_mode_flag)
* This is not in .bss, because we set it sufficiently early that the boot-time * This is not in .bss, because we set it sufficiently early that the boot-time
* zeroing of .bss would clobber it. * 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_EL2
.long BOOT_CPU_MODE_EL1 .long BOOT_CPU_MODE_EL1
SYM_DATA_END(__boot_cpu_mode)
/* /*
* The booting CPU updates the failed status @__early_cpu_boot_status, * The booting CPU updates the failed status @__early_cpu_boot_status,
* with MMU turned off. * with MMU turned off.
*/ */
ENTRY(__early_cpu_boot_status) SYM_DATA_START(__early_cpu_boot_status)
.quad 0 .quad 0
SYM_DATA_END(__early_cpu_boot_status)
.popsection .popsection
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment