Index: sys/arch/arm/arm32/cpuswitch.S
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/cpuswitch.S,v
retrieving revision 1.103
diff -u -p -r1.103 cpuswitch.S
--- sys/arch/arm/arm32/cpuswitch.S	15 Aug 2020 13:33:54 -0000	1.103
+++ sys/arch/arm/arm32/cpuswitch.S	21 Nov 2020 10:06:41 -0000
@@ -324,7 +322,8 @@ ENTRY_NP(lwp_trampoline)
 	GET_CPSR(r0)
 	CPSID_I(r0, r0)			/* Kill irq's */
 
-	GET_CURCPU(r4)			/* for DO_AST */
+	/* for DO_AST */
+	GET_CURX(r4, r5)		/* r4 = curcpu, r5 = curlwp */
 	DO_AST_AND_RESTORE_ALIGNMENT_FAULTS
 	PULLFRAME