1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index ed767b747fe5..e9cc2b32bdf4 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -165,6 +165,10 @@ GLOBAL(ftrace_regs_call)
         movq EFLAGS(%rsp), %rax
         movq %rax, SS(%rsp)
 
+        /* Handlers can change the RIP */
+        movq RIP(%rsp), %rax
+        movq %rax, SS+8(%rsp)
+
         /* restore the rest of pt_regs */
         movq R15(%rsp), %r15
         movq R14(%rsp), %r14