From owner-svn-src-stable@FreeBSD.ORG  Sat Jun 16 18:37:55 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B88F106566C;
	Sat, 16 Jun 2012 18:37:55 +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 751CA8FC08;
	Sat, 16 Jun 2012 18:37:55 +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 q5GIbt5E059666;
	Sat, 16 Jun 2012 18:37:55 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5GIbtWo059664;
	Sat, 16 Jun 2012 18:37:55 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201206161837.q5GIbtWo059664@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 16 Jun 2012 18:37:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237167 - stable/7/sys/amd64/amd64
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jun 2012 18:37:55 -0000

Author: kib
Date: Sat Jun 16 18:37:54 2012
New Revision: 237167
URL: http://svn.freebsd.org/changeset/base/237167

Log:
  Move misplaced comment.
  
  Discussed with:	bz

Modified:
  stable/7/sys/amd64/amd64/trap.c

Modified: stable/7/sys/amd64/amd64/trap.c
==============================================================================
--- stable/7/sys/amd64/amd64/trap.c	Sat Jun 16 17:05:09 2012	(r237166)
+++ stable/7/sys/amd64/amd64/trap.c	Sat Jun 16 18:37:54 2012	(r237167)
@@ -970,10 +970,6 @@ syscall(struct trapframe *frame)
 	}
 
 	/*
-	 * Traced syscall.
-	 */
-
-	/*
 	 * If the user-supplied value of %rip is not a canonical
 	 * address, then some CPUs will trigger a ring 0 #GP during
 	 * the sysret instruction.  However, the fault handler would
@@ -989,6 +985,10 @@ syscall(struct trapframe *frame)
 		ksi.ksi_addr = (void *)td->td_frame->tf_rip;
 		trapsignal(td, &ksi);
 	}
+
+	/*
+	 * Traced syscall.
+	 */
 	if (orig_tf_rflags & PSL_T) {
 		frame->tf_rflags &= ~PSL_T;
 		ksiginfo_init_trap(&ksi);