diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 976f629c60fe02fbeacd45a818836c1c8788150b..b9d5b9b9ea526335070c5e2ef17dac11c442943a 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -212,8 +212,8 @@ alternative_else_nop_endif
 	 * Ensure MDSCR_EL1.SS is clear, since we can unmask debug exceptions
 	 * when scheduling.
 	 */
-	.if \fast_mode == std
 	ldr	x19, [tsk, #TSK_TI_FLAGS]
+	.if \fast_mode == std
 	disable_step_tsk x19, x20
 	.endif