Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-1
+1
-1
arch/arm64/include/asm/el2_setup.h
+1
-1
arch/arm64/include/asm/el2_setup.h
···
106
106
msr_s SYS_ICC_SRE_EL2, x0
107
107
isb // Make sure SRE is now set
108
108
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
110
110
msr_s SYS_ICH_HCR_EL2, xzr // Reset ICC_HCR_EL2 to defaults
111
111
.Lskip_gicv3_\@:
112
112
.endm