diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2020-03-25 11:10:51 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2020-03-25 11:10:51 +0000 |
| commit | 806dc825f01f1543f613b8195112ef06d04eb6d3 (patch) | |
| tree | e239498bc833c3b19b2b27cbdd2fcc6f5d623ed4 /arch/arm64/kernel/head.S | |
| parent | 0829a076958ddd203cf4824dd330c93ba4662815 (diff) | |
| parent | 6cf9a2dce6bd10cf454cf6299c1c23182cb486e7 (diff) | |
Merge branch 'for-next/asm-cleanups' into for-next/core
* for-next/asm-cleanups:
: Various asm clean-ups (alignment, mov_q vs ldr, .idmap)
arm64: move kimage_vaddr to .rodata
arm64: use mov_q instead of literal ldr
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 5fa9daa1d227..2f7ea6d8f5bf 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -457,17 +457,19 @@ SYM_FUNC_START_LOCAL(__primary_switched) b start_kernel SYM_FUNC_END(__primary_switched) + .pushsection ".rodata", "a" +SYM_DATA_START(kimage_vaddr) + .quad _text - TEXT_OFFSET +SYM_DATA_END(kimage_vaddr) +EXPORT_SYMBOL(kimage_vaddr) + .popsection + /* * end early head section, begin head code that is also used for * hotplug and needs to have the same protections as the text region */ .section ".idmap.text","awx" -SYM_DATA_START(kimage_vaddr) - .quad _text - TEXT_OFFSET -SYM_DATA_END(kimage_vaddr) -EXPORT_SYMBOL(kimage_vaddr) - /* * If we're fortunate enough to boot at EL2, ensure that the world is * sane before dropping to EL1. |