Failed in applying to current master (
apply log)
xen/arch/x86/cpu/common.c | 10 +-
xen/arch/x86/domain.c | 96 ++++++++++++------
xen/arch/x86/domctl.c | 42 +++++++-
xen/arch/x86/include/asm/cpu-user-regs.h | 65 +++++++++++++
xen/arch/x86/include/asm/current.h | 11 ++-
xen/arch/x86/include/asm/domain.h | 2 +
xen/arch/x86/include/asm/hvm/hvm.h | 4 -
xen/arch/x86/include/asm/regs.h | 28 ++++--
xen/arch/x86/include/asm/x86_64/regs.h | 28 ------
xen/arch/x86/pv/dom0_build.c | 6 +-
xen/arch/x86/traps.c | 2 +-
xen/arch/x86/x86_64/asm-offsets.c | 2 +-
xen/arch/x86/x86_64/traps.c | 119 +++++++++++++----------
xen/arch/x86/x86_emulate/private.h | 2 +
xen/include/public/arch-x86/xen-x86_32.h | 8 ++
xen/include/public/arch-x86/xen-x86_64.h | 8 ++
xen/include/public/arch-x86/xen.h | 6 ++
xen/include/xlat.lst | 2 -
18 files changed, 301 insertions(+), 140 deletions(-)
create mode 100644 xen/arch/x86/include/asm/cpu-user-regs.h
delete mode 100644 xen/arch/x86/include/asm/x86_64/regs.h