[Xen-changelog] [linux-2.6.18-xen] linux/x86-64: fix unwind annotations

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1225103528 0
# Node ID 2b1dc4b1b23168227806e3d1facc26f814b25764
# Parent  e410857fd83c2c6f9c0c0a4adb84f25e7f81c617
linux/x86-64: fix unwind annotations

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/x86_64/kernel/entry-xen.S |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff -r e410857fd83c -r 2b1dc4b1b231 arch/x86_64/kernel/entry-xen.S
--- a/arch/x86_64/kernel/entry-xen.S    Wed Oct 22 14:55:29 2008 +0100
+++ b/arch/x86_64/kernel/entry-xen.S    Mon Oct 27 10:32:08 2008 +0000
@@ -117,9 +117,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
@@ -129,20 +129,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
 
         /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog