From: Jan Beulich Date: Fri, 3 Feb 2006 20:51:44 +0000 (+0100) Subject: [PATCH] x86_64: small fix for CFI annotations X-Git-Tag: v2.6.16-rc3~181 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=91522a964b295e7bccb173218cc00adadfc77bbf;p=linux-2.6-omap-h63xx.git [PATCH] x86_64: small fix for CFI annotations Conditionalize two unwind directives to match other similarly conditional code. Signed-Off-By: Jan Beulich Cc: Jim Houston Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index cdf9cb1288c..b150c87a08c 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