public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Mark J. Wielaard" <mjw@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Mark Wielaard <mjw@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de> (maintainer:X86
	ARCHITECTURE...),
	Ingo Molnar <mingo@redhat.com> (maintainer:X86 ARCHITECTURE... 
	,commit_signer:11/25=44%),
	"H. Peter Anvin" <hpa@zytor.com> (maintainer:X86 ARCHITECTURE...
	 ,commit_signer:4/25=16%),
	x86@kernel.org (maintainer:X86 ARCHITECTURE...),
	Jan Beulich <jbeulich@suse.com> (commit_signer:6/25=24%),
	Andi Kleen <ak@linux.intel.com> (commit_signer:5/25=20%),
	Frederic Weisbecker <fweisbec@gmail.com> (commit_signer:4/25=16%)
Subject: [PATCH] x86-64: Fix CFI data for common_interrupt
Date: Fri, 24 Feb 2012 11:32:05 +0100	[thread overview]
Message-ID: <1330079527-30711-1-git-send-email-mjw@redhat.com> (raw)
In-Reply-To: <4F476B4E0200007800074936@nat28.tlf.novell.com>

From: Mark Wielaard <mjw@redhat.com>

Commit eab9e6 "x86-64: Fix CFI data for interrupt frames" introduced
a DW_CFA_def_cfa_expression in the SAVE_ARGS_IRQ macro. To later define
the CFA using a simple register+offset rule both register and offset
need to be supplied. Just using CFI_DEF_CFA_REGISTER leaves the offset
undefined. So use CFI_DEF_CFA with reg+off explicitly at the end of
common_interrupt.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
 arch/x86/kernel/entry_64.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 3fe8239..54be36b 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -813,7 +813,7 @@ ret_from_intr:
 
 	/* Restore saved previous stack */
 	popq %rsi
-	CFI_DEF_CFA_REGISTER	rsi
+	CFI_DEF_CFA rsi,SS+8-RBP	/* reg/off reset after def_cfa_expr */
 	leaq ARGOFFSET-RBP(%rsi), %rsp
 	CFI_DEF_CFA_REGISTER	rsp
 	CFI_ADJUST_CFA_OFFSET	RBP-ARGOFFSET
-- 
1.7.7.6


  reply	other threads:[~2012-02-24 10:33 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-21 14:06 [PATCH] x86-64: Fix CFI data for common_interrupt Mark Wielaard
2012-02-21 14:26 ` Jan Beulich
2012-02-21 14:43   ` Mark Wielaard
2012-02-21 15:26     ` Jan Beulich
2012-02-21 22:08       ` Mark Wielaard
2012-02-22  8:05         ` Jan Beulich
2012-02-24  9:49         ` Jan Beulich
2012-02-24 10:32           ` Mark J. Wielaard [this message]
2012-02-27 12:08             ` [tip:x86/debug] x86-64: Fix CFI data for common_interrupt() tip-bot for Mark Wielaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330079527-30711-1-git-send-email-mjw@redhat.com \
    --to=mjw@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jbeulich@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox