From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 19 12:12:25 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 73E39EF0;
 Wed, 19 Dec 2012 12:12:25 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 588F98FC0A;
 Wed, 19 Dec 2012 12:12:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBJCCPxj089878;
 Wed, 19 Dec 2012 12:12:25 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJCCP9v089877;
 Wed, 19 Dec 2012 12:12:25 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201212191212.qBJCCP9v089877@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Wed, 19 Dec 2012 12:12:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244427 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 12:12:25 -0000

Author: cherry
Date: Wed Dec 19 12:12:24 2012
New Revision: 244427
URL: http://svnweb.freebsd.org/changeset/base/244427

Log:
   - Fix stack layout on return from exception via hypervisor_iret. This
     xen hypercall requires a return code at the bottom of the stack.
  
  Approved by: gibbs (implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/exception.S

Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/exception.S	Wed Dec 19 12:10:14 2012	(r244426)
+++ projects/amd64_xen_pv/sys/amd64/xen/exception.S	Wed Dec 19 12:12:24 2012	(r244427)
@@ -131,10 +131,10 @@
 	subq 	$TF_ERR, %rsp
 
 #define TRAP_FRAME_EXIT_NOERR \
-	addq	$TF_RIP, %rsp
+	addq	$TF_RIP + 8, %rsp
 
 #define TRAP_FRAME_EXIT_ERR \
-	addq 	$TF_ERR, %rsp
+	addq 	$TF_ERR + 8, %rsp
 
 #define TRAP_PROLOGUE(a) \
 	movl	$(a), TF_TRAPNO(%rsp) 	; \