Merge branch 'x86/debug' into x86/irq

We merge this branch because x86/debug touches code that we started
cleaning up in x86/irq. The two branches started out independent,
but as unexpected amount of activity went into x86/irq, they became
dependent. Resolve that by this cross-merge.

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 08c0c9777a09..e41734a537bd 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -373,6 +373,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
@@ -382,6 +383,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
@@ -1173,6 +1175,7 @@ ENTRY(child_rip)
         # exit
         mov %eax, %edi
         call do_exit
+        ud2                     # padding for call trace
         CFI_ENDPROC
 END(child_rip)