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/kern_lock.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/kern_lock.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.105.2.4
retrieving revision 1.105.2.5
diff -u -p -r1.105.2.4 -r1.105.2.5
--- src/sys/kern/kern_lock.c	2007/03/24 00:43:06	1.105.2.4
+++ src/sys/kern/kern_lock.c	2007/04/15 16:03:49	1.105.2.5
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lock.c,v 1.105.2.4 2007/03/24 00:43:06 rmind Exp $	*/
+/*	$NetBSD: kern_lock.c,v 1.105.2.5 2007/04/15 16:03:49 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.105.2.4 2007/03/24 00:43:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.105.2.5 2007/04/15 16:03:49 yamt Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_ddb.h"
@@ -126,10 +126,11 @@ int	lock_debug_syslog = 0;	/* defaults t
 #if !defined(__HAVE_SPLBIGLOCK)
 #define	splbiglock	splclock
 #endif
-__cpu_simple_lock_t kernel_lock;
 int kernel_lock_id;
 #endif
 
+__cpu_simple_lock_t kernel_lock;
+
 /*
  * Locking primitives implementation.
  * Locks provide shared/exclusive synchronization.
@@ -883,10 +884,11 @@ lockmgr(volatile struct lock *lkp, u_int
 					    "exclusive lock holder %lu "
 					    "unlocking", cpu_num, lkp->lk_cpu);
 				} else {
-					lockpanic(lkp, "lockmgr: pid %d, not "
-					    "exclusive lock holder %d "
-					    "unlocking", pid,
-					    lkp->lk_lockholder);
+					lockpanic(lkp, "lockmgr: pid %d.%d, not "
+					    "exclusive lock holder %d.%d "
+					    "unlocking", pid, lid,
+					    lkp->lk_lockholder,
+					    lkp->lk_locklwp);
 				}
 			}
 			if (lkp->lk_exclusivecount == lkp->lk_recurselevel)