1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index ab9b2c4726f2..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:
          */
@@ -1174,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