diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-04-17 17:17:05 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-04-17 17:17:05 +0200 |
| commit | 236b2f5b9b855c4aedc2cc16e923f34bf6caefd0 (patch) | |
| tree | 1fbfb3437f2f23f74d3e7ff411cc0c866c896d24 /xen/arch/x86/x86_64/entry.S | |
| parent | 5768aa97b54a3539c495787374bf5e5863370db1 (diff) | |
| download | xen-236b2f5b9b855c4aedc2cc16e923f34bf6caefd0.tar.gz xen-236b2f5b9b855c4aedc2cc16e923f34bf6caefd0.tar.bz2 xen-236b2f5b9b855c4aedc2cc16e923f34bf6caefd0.zip | |
x86-64: fix updating of UREGS_rip when converting sysenter to #GP
(I spotted this copy-and-paste mistake only when backporting c/s
25200:80f4113be500 to 4.1 and 4.0.)
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/x86_64/entry.S')
| -rw-r--r-- | xen/arch/x86/x86_64/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 3c15a04e51..b78bd24245 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -280,7 +280,7 @@ sysenter_eflags_saved: UNLIKELY_START(z, sysenter_gpf) movq VCPU_trap_ctxt(%rbx),%rsi movl $TRAP_gp_fault,UREGS_entry_vector(%rsp) - subl $2,UREGS_rip(%rsp) + subq $2,UREGS_rip(%rsp) movl %eax,TRAPBOUNCE_error_code(%rdx) movq TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_eip(%rsi),%rax testb $4,TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_flags(%rsi) |