1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index a7691a378668..f860bfda454a 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -352,8 +352,8 @@ el1_inv:
         // TODO: add support for undefined instructions in kernel mode
         enable_dbg
         mov     x0, sp
+        mov     x2, x1
         mov     x1, #BAD_SYNC
-        mrs     x2, esr_el1
         b       bad_mode
 ENDPROC(el1_sync)
 
@@ -553,7 +553,7 @@ el0_inv:
         ct_user_exit
         mov     x0, sp
         mov     x1, #BAD_SYNC
-        mrs     x2, esr_el1
+        mov     x2, x25
         bl      bad_mode
         b       ret_to_user
 ENDPROC(el0_sync)