From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keir Fraser Subject: Re: [PATCH] x86-64: fix updating of UREGS_rip when converting sysenter to #GP Date: Tue, 17 Apr 2012 16:05:38 +0100 Message-ID: References: <4F8DA0F4020000780007E940@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4F8DA0F4020000780007E940@nat28.tlf.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich , xen-devel List-Id: xen-devel@lists.xenproject.org On 17/04/2012 15:57, "Jan Beulich" wrote: > (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 Acked-by: Keir Fraser > --- 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) > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel