hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICG4XI -------------------------------- Kernel_{entry, exit} fast mode should only skip some alternative step but not any register. Fix it directly, moves all register touch outside fast mode. Fixes: f22cbd7df343 ("arm64: Faster SVC exception handler with xcall") Signed-off-by: Yipeng Zou <zouyipeng@huawei.com> --- arch/arm64/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 976f629c60fe..b9d5b9b9ea52 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 -- 2.34.1