From owner-svn-src-all@FreeBSD.ORG  Sun Sep 11 18:00:46 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E07C106566B;
	Sun, 11 Sep 2011 18:00:46 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DA088FC08;
	Sun, 11 Sep 2011 18:00:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8BI0kxq089746;
	Sun, 11 Sep 2011 18:00:46 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8BI0kT8089744;
	Sun, 11 Sep 2011 18:00:46 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201109111800.p8BI0kT8089744@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 11 Sep 2011 18:00:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225483 - head/sys/amd64/amd64
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Sep 2011 18:00:46 -0000

Author: kib
Date: Sun Sep 11 18:00:46 2011
New Revision: 225483
URL: http://svn.freebsd.org/changeset/base/225483

Log:
  The jump target shall be after the padding, not into it.
  
  Reported by:	alc
  Approved by:	re (bz)
  MFC after:	2 weeks

Modified:
  head/sys/amd64/amd64/exception.S

Modified: head/sys/amd64/amd64/exception.S
==============================================================================
--- head/sys/amd64/amd64/exception.S	Sun Sep 11 17:39:51 2011	(r225482)
+++ head/sys/amd64/amd64/exception.S	Sun Sep 11 18:00:46 2011	(r225483)
@@ -398,8 +398,9 @@ IDTVEC(fast_syscall)
 	movq	%rsp, %rdi
 	call	ast
 	jmp	1b
-2:	/* Restore preserved registers. */
+
 	.align	16
+2:	/* Restore preserved registers. */
 	MEXITCOUNT
 	movq	TF_RDI(%rsp),%rdi	/* bonus; preserve arg 1 */
 	movq	TF_RSI(%rsp),%rsi	/* bonus: preserve arg 2 */