svn commit: r237167 - stable/7/sys/amd64/amd64

Konstantin Belousov kib at FreeBSD.org
Sat Jun 16 18:37:55 UTC 2012


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);


More information about the svn-src-stable-7 mailing list