From owner-p4-projects  Fri Jun 28 18:26:10 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C65BD37B400; Fri, 28 Jun 2002 18:26:04 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4AAC937B401
	for <perforce@freebsd.org>; Fri, 28 Jun 2002 18:26:04 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0D09B43E06
	for <perforce@freebsd.org>; Fri, 28 Jun 2002 18:26:04 -0700 (PDT)
	(envelope-from julian@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T1Q3JU063568
	for <perforce@freebsd.org>; Fri, 28 Jun 2002 18:26:03 -0700 (PDT)
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T1Q3Xf063565
	for perforce@freebsd.org; Fri, 28 Jun 2002 18:26:03 -0700 (PDT)
Date: Fri, 28 Jun 2002 18:26:03 -0700 (PDT)
Message-Id: <200206290126.g5T1Q3Xf063565@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
Subject: PERFORCE change 13551 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13551

Change 13551 by julian@julian_ref on 2002/06/28 18:25:56

	Don't need Giant pre-set for userret()

Affected files ...

.. //depot/projects/kse/sys/i386/i386/trap.c#55 edit

Differences ...

==== //depot/projects/kse/sys/i386/i386/trap.c#55 (text+ko) ====

@@ -1076,6 +1076,12 @@
 	}
 
 	/*
+	 * Release Giant if we previously set it.
+	 */
+	if ((callp->sy_narg & SYF_MPSAFE) == 0)
+		mtx_unlock(&Giant);
+
+	/*
 	 * Traced syscall.
 	 */
 	if ((orig_tf_eflags & PSL_T) && !(orig_tf_eflags & PSL_VM)) {
@@ -1088,12 +1094,6 @@
 	 */
 	userret(td, &frame, sticks);
 
-	/*
-	 * Release Giant if we previously set it.
-	 */
-	if ((callp->sy_narg & SYF_MPSAFE) == 0)
-		mtx_unlock(&Giant);
-
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_SYSRET))
 		ktrsysret(code, error, td->td_retval[0]);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message