summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2006-02-03 21:51:44 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 16:43:15 -0800
commit91522a964b295e7bccb173218cc00adadfc77bbf (patch)
treec31d9a47b3ef774c20d29a94ffe26ee157d9c7ee
parent0c3749c41f5eee0da36bbf92b2793338b4d8574f (diff)
downloadop-kernel-dev-91522a964b295e7bccb173218cc00adadfc77bbf.zip
op-kernel-dev-91522a964b295e7bccb173218cc00adadfc77bbf.tar.gz
[PATCH] x86_64: small fix for CFI annotations
Conditionalize two unwind directives to match other similarly conditional code. Signed-Off-By: Jan Beulich <jbeulich@novell.com> Cc: Jim Houston <jim.houston@ccur.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/kernel/entry.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index cdf9cb1..b150c87 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -499,7 +499,9 @@ ENTRY(stub_rt_sigreturn)
movq %gs:pda_irqstackptr,%rax
cmoveq %rax,%rsp /*todo This needs CFI annotation! */
pushq %rdi # save old stack
+#ifndef CONFIG_DEBUG_INFO
CFI_ADJUST_CFA_OFFSET 8
+#endif
call \func
.endm
@@ -509,7 +511,9 @@ ENTRY(common_interrupt)
/* 0(%rsp): oldrsp-ARGOFFSET */
ret_from_intr:
popq %rdi
+#ifndef CONFIG_DEBUG_INFO
CFI_ADJUST_CFA_OFFSET -8
+#endif
cli
decl %gs:pda_irqcount
#ifdef CONFIG_DEBUG_INFO
OpenPOWER on IntegriCloud