From 861c24bf6c928ab01655e0f028169ccb080eeea5 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 9 Jun 2020 12:52:14 +0100 Subject: [PATCH] Revert "FROMLIST: arm64: efi: restore x18 if it was corrupted" Shadow call stack is now merged upstream for 5.9, so revert the patches cherry-picked into android-mainline in preparation for pulling the upstream version instead. This reverts commit 0db85aae47c6408fb330a3863243e6bf8a47368a. Signed-off-by: Will Deacon Change-Id: I1ea401c18421641e334f06fb8249b463968087eb --- 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 62f0260f5c17..3fc71106cb2b 100644 --- a/arch/arm64/kernel/efi-rt-wrapper.S +++ b/arch/arm64/kernel/efi-rt-wrapper.S @@ -34,14 +34,5 @@ ENTRY(__efi_rt_asm_wrapper) ldp x29, x30, [sp], #32 b.ne 0f ret -0: -#ifdef CONFIG_SHADOW_CALL_STACK - /* - * Restore x18 before returning to 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 -#endif - b efi_handle_corrupted_x18 // tail call +0: b efi_handle_corrupted_x18 // tail call ENDPROC(__efi_rt_asm_wrapper)