From owner-p4-projects@FreeBSD.ORG  Wed Apr  4 17:24:51 2007
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 24C6716A404; Wed,  4 Apr 2007 17:24:51 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E9F4C16A401
	for <perforce@FreeBSD.org>; Wed,  4 Apr 2007 17:24:50 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id D9D9D13C45B
	for <perforce@FreeBSD.org>; Wed,  4 Apr 2007 17:24:50 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l34HOotN013042
	for <perforce@FreeBSD.org>; Wed, 4 Apr 2007 17:24:50 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l34HOocf013038
	for perforce@freebsd.org; Wed, 4 Apr 2007 17:24:50 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 4 Apr 2007 17:24:50 GMT
Message-Id: <200704041724.l34HOocf013038@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 117378 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: Wed, 04 Apr 2007 17:24:51 -0000

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

Change 117378 by gonzo@gonzo_jeeves on 2007/04/04 17:24:18

	o Retire SYF_ARGMASK and remove both SYF_MPSAFE and SYF_ARGMASK.  

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/trap.c#18 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/trap.c#18 (text+ko) ====

@@ -375,7 +375,6 @@
 	u_int nargs, i;
 	register_t *args, copyargs[MAXARGS];
 	struct sysent *callp;
-	int locked = 0;
 	int args_shift = 0;
 	int quad_syscall = 0;
 	register_t ov0, opc;
@@ -424,7 +423,7 @@
 		callp = &p->p_sysent->sv_table[0];
 	else
 		callp = &p->p_sysent->sv_table[code];
-	nargs = callp->sy_narg & SYF_ARGMASK;
+	nargs = callp->sy_narg;
 
 	/* Copy arguments from a0..a4 */
 	for(i = 0; i < MIN(nargs, 4 - args_shift); i++)
@@ -459,9 +458,6 @@
 	CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
 	    td->td_proc->p_pid, td->td_proc->p_comm, code);
 
-	if ((callp->sy_narg & SYF_MPSAFE) == 0)
-		mtx_lock(&Giant);
-	locked = 1;
 	if (error == 0) {
 		td->td_retval[0] = 0;
 		td->td_retval[1] = 0;
@@ -513,9 +509,6 @@
 		break;
 	}
 
-	if (locked && (callp->sy_narg & SYF_MPSAFE) == 0)
-		mtx_unlock(&Giant);
-
 	WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
 	    (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???");
 	KASSERT(td->td_critnest == 0,