hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I80QRY CVE: NA
--------------------------------
This reverts commit 1928ac07d3de3fe15eb6fe6ad3f1c1370dba3d9e.
Signed-off-by: Wei Li liwei391@huawei.com --- arch/arm64/kernel/efi-rt-wrapper.S | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/arm64/kernel/efi-rt-wrapper.S b/arch/arm64/kernel/efi-rt-wrapper.S index e02329e79ee1..05235ebb336d 100644 --- a/arch/arm64/kernel/efi-rt-wrapper.S +++ b/arch/arm64/kernel/efi-rt-wrapper.S @@ -37,14 +37,5 @@ ENTRY(__efi_rt_asm_wrapper) ldp x29, x30, [sp], #32 b.ne 0f ret -0: - /* - * With CONFIG_SHADOW_CALL_STACK, the kernel uses x18 to store a - * shadow stack pointer, which we need to restore before returning to - * potentially instrumented code. This is safe because the wrapper is - * called with preemption disabled and a separate shadow stack is used - * for interrupts. - */ - mov x18, x2 - b efi_handle_corrupted_x18 // tail call +0: b efi_handle_corrupted_x18 // tail call ENDPROC(__efi_rt_asm_wrapper)