From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 6 Jan 2017 14:33:54 +0000 (+0000)
Subject: xen/x86: Fix CONFIG_CRASH_DEBUG build following c/s 897129dea
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3041
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9009ea4706b10798878ab8dfe34e40dbf315c339;p=xen.git

xen/x86: Fix CONFIG_CRASH_DEBUG build following c/s 897129dea

Found by a Travis RANDCONFIG run.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
---

diff --git a/xen/arch/x86/gdbstub.c b/xen/arch/x86/gdbstub.c
index 2a391892a4..fe69f81db6 100644
--- a/xen/arch/x86/gdbstub.c
+++ b/xen/arch/x86/gdbstub.c
@@ -66,16 +66,16 @@ gdb_arch_resume(struct cpu_user_regs *regs,
                 struct gdb_context *ctx)
 {
     if ( addr != -1UL )
-        regs->eip = addr;
+        regs->rip = addr;
 
-    regs->eflags &= ~X86_EFLAGS_TF;
+    regs->_eflags &= ~X86_EFLAGS_TF;
 
     /* Set eflags.RF to ensure we do not re-enter. */
-    regs->eflags |= X86_EFLAGS_RF;
+    regs->_eflags |= X86_EFLAGS_RF;
 
     /* Set the trap flag if we are single stepping. */
     if ( type == GDB_STEP )
-        regs->eflags |= X86_EFLAGS_TF;
+        regs->_eflags |= X86_EFLAGS_TF;
 }
 
 /*
diff --git a/xen/arch/x86/x86_64/gdbstub.c b/xen/arch/x86/x86_64/gdbstub.c
index 2626519c89..2c2ab15fc8 100644
--- a/xen/arch/x86/x86_64/gdbstub.c
+++ b/xen/arch/x86/x86_64/gdbstub.c
@@ -44,7 +44,7 @@ gdb_arch_read_reg_array(struct cpu_user_regs *regs, struct gdb_context *ctx)
     GDB_REG64(regs->r15);
 
     GDB_REG64(regs->rip);
-    GDB_REG32(regs->eflags);
+    GDB_REG32(regs->_eflags);
 
     GDB_REG32(regs->cs);
     GDB_REG32(regs->ss);