Skip to contentSkip to conversation

arm64: head: Convert install_el2_stub to SYM_INNER_LABEL

PATCH Applied Mark Brown 3 participants 5 messages Mar 23, 2020 – Mar 25, 2020 arm64

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 arm64: head: Convert install_el2_stub to SYM_INNER_LABEL

New assembly annotations have recently been introduced which aim to make the way we describe symbols in assembly more consistent. Recently the arm64 assembler was converted to use these but install_el2_stub was missed.

---
 arch/arm64/kernel/head.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/head.S +1 -1
index a06727354fad..22c6a04f6b82 100644
@@ -600,7 +600,7 @@ set_hcr:
 	isb
 	ret
 
-install_el2_stub:
+SYM_INNER_LABEL(install_el2_stub, SYM_L_GLOBAL)
 	/*
 	 * When VHE is not in use, early init of EL2 and EL1 needs to be
 	 * done here.
Signature · 7 lines
2.20.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Applied
#1 lore raw
Quoted 5 lines · Mark Brown

New assembly annotations have recently been introduced which aim to make the way we describe symbols in assembly more consistent. Recently the arm64 assembler was converted to use these but install_el2_stub was missed.

Applied. Thanks.

Signature · 6 lines
Catalin

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw
In reply to Mark Brown
Quoted 15 lines · Mark Brown

New assembly annotations have recently been introduced which aim to make the way we describe symbols in assembly more consistent. Recently the arm64 assembler was converted to use these but install_el2_stub was missed.

---
 arch/arm64/kernel/head.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/head.S +0 -0
index a06727354fad..22c6a04f6b82 100644

arch/arm64/kernel/head.S set_hcr: · line 603

Quoted 5 lines
arch/arm64/kernel/head.S +1 -1
@@ -600,7 +600,7 @@ set_hcr:
        isb
        ret
 
-install_el2_stub:
+SYM_INNER_LABEL(install_el2_stub, SYM_L_GLOBAL)

Shouldn't this be SYM_L_LOCAL?

Quoted 11 lines
arch/arm64/kernel/head.S +0 -1
        /*
         * When VHE is not in use, early init of EL2 and EL1 needs to be
         * done here.
--

2.20.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer
#4 lore raw
Quoted 9 lines · Mark Brown
Quoted 6 lines · Ard Biesheuvel

arch/arm64/kernel/head.S set_hcr: · line 603

Quoted 2 lines · Mark Brown
arch/arm64/kernel/head.S +1 -1
-install_el2_stub:
+SYM_INNER_LABEL(install_el2_stub, SYM_L_GLOBAL)

Shouldn't this be SYM_L_LOCAL?

I think it could be, yes.

I fixed up the patch locally.

Signature · 6 lines
Catalin

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel