linux/x86-64: fix unwind annotations
PATCH 1/1 linux/x86-64: fix unwind annotations
As usual, written and tested on 2.6.27.3 and made apply to the 2.6.18 tree without further testing.
Signed-off-by Jan Beulich <[email protected]>
arch/x86_64/kernel/entry-xen.S +16 -16
@@ -121,9 +121,9 @@ NMI_MASK = 0x80000000 .macro CFI_DEFAULT_STACK start=1,adj=0 .if \start CFI_STARTPROC simple - CFI_DEF_CFA rsp,SS+8-(\adj*ARGOFFSET) + CFI_DEF_CFA rsp,SS+8 - \adj*ARGOFFSET .else - CFI_DEF_CFA_OFFSET SS+8-(\adj*ARGOFFSET) + CFI_DEF_CFA_OFFSET SS+8 - \adj*ARGOFFSET .endif .if \adj == 0 CFI_REL_OFFSET r15,R15
@@ -133,20 +133,20 @@ NMI_MASK = 0x80000000 CFI_REL_OFFSET rbp,RBP CFI_REL_OFFSET rbx,RBX .endif - CFI_REL_OFFSET r11,R11 - CFI_REL_OFFSET r10,R10 - CFI_REL_OFFSET r9,R9 - CFI_REL_OFFSET r8,R8 - CFI_REL_OFFSET rax,RAX - CFI_REL_OFFSET rcx,RCX - CFI_REL_OFFSET rdx,RDX - CFI_REL_OFFSET rsi,RSI - CFI_REL_OFFSET rdi,RDI - CFI_REL_OFFSET rip,RIP - /*CFI_REL_OFFSET cs,CS*/ - /*CFI_REL_OFFSET rflags,EFLAGS*/ - CFI_REL_OFFSET rsp,RSP - /*CFI_REL_OFFSET ss,SS*/ + CFI_REL_OFFSET r11,R11 - \adj*ARGOFFSET + CFI_REL_OFFSET r10,R10 - \adj*ARGOFFSET + CFI_REL_OFFSET r9,R9 - \adj*ARGOFFSET + CFI_REL_OFFSET r8,R8 - \adj*ARGOFFSET + CFI_REL_OFFSET rax,RAX - \adj*ARGOFFSET + CFI_REL_OFFSET rcx,RCX - \adj*ARGOFFSET + CFI_REL_OFFSET rdx,RDX - \adj*ARGOFFSET + CFI_REL_OFFSET rsi,RSI - \adj*ARGOFFSET + CFI_REL_OFFSET rdi,RDI - \adj*ARGOFFSET + CFI_REL_OFFSET rip,RIP - \adj*ARGOFFSET + /*CFI_REL_OFFSET cs,CS - \adj*ARGOFFSET*/ + /*CFI_REL_OFFSET rflags,EFLAGS - \adj*ARGOFFSET*/ + CFI_REL_OFFSET rsp,RSP - \adj*ARGOFFSET + /*CFI_REL_OFFSET ss,SS - \adj*ARGOFFSET*/ .endm /*