From: Andi Kleen <ak@suse.de>
Date: Thu, 5 Oct 2006 16:47:22 +0000 (+0200)
Subject: [PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers
X-Git-Tag: v2.6.19-rc2~316^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7d0b0e8ddbdda58a852ccff010c0339a38552cc7;p=linux-2.6-omap-h63xx.git

[PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers

Add correct CFI annotation to the backlink on top of the interrupt stack.

Signed-off-by: Andi Kleen <ak@suse.de>
---

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index ab9b2c4726f..38a7b2d528e 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