1 files changed, 2 insertions, 0 deletions

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index b86f332c96a6..ddeeb1052583 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -255,6 +255,7 @@ ENTRY(ret_from_fork)
         call schedule_tail
         GET_THREAD_INFO(%rcx)
         testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
+        CFI_REMEMBER_STATE
         jnz rff_trace
 rff_action:     
         RESTORE_REST
@@ -264,6 +265,7 @@ rff_action:
         jnz  int_ret_from_sys_call
         RESTORE_TOP_OF_STACK %rdi,ARGOFFSET
         jmp ret_from_sys_call
+        CFI_RESTORE_STATE
 rff_trace:
         movq %rsp,%rdi
         call syscall_trace_leave