Skip to content

Commit 45a98a7

Browse files
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Fix wrong branch label in the EL2 GICv3 initialisation code" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Correct wrong label in macro __init_el2_gicv3
2 parents ea4b3d2 + 4f6de67 commit 45a98a7

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm64/include/asm/el2_setup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
msr_s SYS_ICC_SRE_EL2, x0
107107
isb // Make sure SRE is now set
108108
mrs_s x0, SYS_ICC_SRE_EL2 // Read SRE back,
109-
tbz x0, #0, 1f // and check that it sticks
109+
tbz x0, #0, .Lskip_gicv3_\@ // and check that it sticks
110110
msr_s SYS_ICH_HCR_EL2, xzr // Reset ICC_HCR_EL2 to defaults
111111
.Lskip_gicv3_\@:
112112
.endm

0 commit comments

Comments
 (0)