Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/sys_descrip.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/sys_descrip.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1
retrieving revision 1.1.6.3
diff -u -p -r1.1 -r1.1.6.3
--- src/sys/kern/sys_descrip.c	2008/03/21 21:53:35	1.1
+++ src/sys/kern/sys_descrip.c	2008/06/02 13:24:11	1.1.6.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_descrip.c,v 1.1 2008/03/21 21:53:35 ad Exp $	*/
+/*	$NetBSD: sys_descrip.c,v 1.1.6.3 2008/06/02 13:24:11 mjf Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -12,13 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -74,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.1 2008/03/21 21:53:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.1.6.3 2008/06/02 13:24:11 mjf Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -252,9 +245,9 @@ do_fcntl_lock(int fd, int cmd, struct fl
 				break;
 			}
 			if ((p->p_flag & PK_ADVLOCK) == 0) {
-				mutex_enter(&p->p_mutex);
+				mutex_enter(p->p_lock);
 				p->p_flag |= PK_ADVLOCK;
-				mutex_exit(&p->p_mutex);
+				mutex_exit(p->p_lock);
 			}
 			error = VOP_ADVLOCK(vp, p, F_SETLK, fl, flg);
 			break;
@@ -265,9 +258,9 @@ do_fcntl_lock(int fd, int cmd, struct fl
 				break;
 			}
 			if ((p->p_flag & PK_ADVLOCK) == 0) {
-				mutex_enter(&p->p_mutex);
+				mutex_enter(p->p_lock);
 				p->p_flag |= PK_ADVLOCK;
-				mutex_exit(&p->p_mutex);
+				mutex_exit(p->p_lock);
 			}
 			error = VOP_ADVLOCK(vp, p, F_SETLK, fl, flg);
 			break;