From owner-p4-projects@FreeBSD.ORG  Thu Aug  3 20:41:17 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EEE7D16A4DF; Thu,  3 Aug 2006 20:41:16 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 CD82716A4DD
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 20:41:16 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AE8FC43D46
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 20:41:16 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73KfGYu068851
	for <perforce@freebsd.org>; Thu, 3 Aug 2006 20:41:16 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KfGXo068848
	for perforce@freebsd.org; Thu, 3 Aug 2006 20:41:16 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 3 Aug 2006 20:41:16 GMT
Message-Id: <200608032041.k73KfGXo068848@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103135 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Aug 2006 20:41:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=103135

Change 103135 by jb@jb_freebsd2 on 2006/08/03 20:40:32

	Catch up on the MPSAFE changes to -current.
	
	Another reason for merging sun4v into current.

Affected files ...

.. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#6 (text+ko) ====

@@ -629,7 +629,7 @@
   	else
  		callp = &p->p_sysent->sv_table[code];
 
-	narg = callp->sy_narg & SYF_ARGMASK;
+	narg = callp->sy_narg;
 
 	if (narg <= regcnt) {
 		argp = &tf->tf_out[reg];
@@ -647,13 +647,6 @@
 	CTR5(KTR_SYSC, "syscall: td=%p %s(%#lx, %#lx, %#lx)", td,
 	    syscallnames[code], argp[0], argp[1], argp[2]);
 
-	/*
-	 * Try to run the syscall without the MP lock if the syscall
-	 * is MP safe.
-	 */
-	if ((callp->sy_narg & SYF_MPSAFE) == 0)
-		mtx_lock(&Giant);
-
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_SYSCALL))
 		ktrsyscall(code, narg, argp);
@@ -733,13 +726,6 @@
 	}
 
 	/*
-	 * Release Giant if we had to get it.  Don't use mtx_owned(),
-	 * we want to catch broken syscalls.
-	 */
-	if ((callp->sy_narg & SYF_MPSAFE) == 0)
-		mtx_unlock(&Giant);
-
-	/*
 	 * Handle reschedule and other end-of-syscall issues
 	 */
 	userret(td, tf);