Index: subr_lock.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/subr_lock.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -r1.19 -r1.20
36c36
< __FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.19 2007/12/15 23:13:31 jeff Exp $");
---
> __FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.20 2007/12/31 03:45:51 jeff Exp $");
152a153
> 	struct lock_class *class;
157d157
< 	const char	*type;
251a252
> 	pause("lpreset", hz / 10);
280c281
< 	    p, lp->line, lp->type, lp->name);
---
> 	    p, lp->line, lp->class->lc_name, lp->name);
293c294
< 	dst->type = match->type;
---
> 	dst->class = match->class;
304c305
< 			    l->name != match->name || l->type != match->type)
---
> 			    l->name != match->name)
344a346
> 	int enabled;
349a352,354
> 	enabled = lock_prof_enable;
> 	lock_prof_enable = 0;
> 	pause("lpreset", hz / 10);
361a367
> 	lock_prof_enable = enabled;
439c445
< 	lp->type = lo->lo_type;
---
> 	lp->class = LOCK_CLASS(lo);