1 files changed, 8 insertions, 0 deletions

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index b8285cf1a9c3..38a7b2d528e2 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -535,6 +535,8 @@ END(stub_rt_sigreturn)
 1:      incl    %gs:pda_irqcount
         cmoveq %gs:pda_irqstackptr,%rsp
         push    %rbp                    # backlink for old unwinder
+        CFI_ADJUST_CFA_OFFSET 8
+        CFI_REL_OFFSET rbp,0
         /*
          * We entered an interrupt context - irqs are off:
          */
@@ -978,6 +980,11 @@ ENTRY(kernel_thread)
         call do_fork
         movq %rax,RAX(%rsp)
         xorl %edi,%edi
+        test %rax,%rax
+        jnz  1f
+        /* terminate stack in child */
+        movq %rdi,RIP(%rsp)
+1:
 
         /*
          * It isn't worth to check for reschedule here,
@@ -1169,6 +1176,7 @@ ENTRY(call_softirq)
         incl %gs:pda_irqcount
         cmove %gs:pda_irqstackptr,%rsp
         push  %rbp                      # backlink for old unwinder
+        CFI_ADJUST_CFA_OFFSET    8
         call __do_softirq
         leaveq
         CFI_DEF_CFA_REGISTER    rsp