[PATCH] x86_64: small fix for CFI annotations (91522a96) · Commits · 戴 / test

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:

arch/x86_64/kernel/entry.S

+4 −0

Original line number	Diff line number	Diff line
		@@ -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