--- //depot/vendor/freebsd/src/sys/amd64/isa/clock.c	2007/07/23 09:47:42
+++ //depot/user/attilio/attilio_smpng/amd64/isa/clock.c	2007/09/12 16:28:07
@@ -565,7 +565,7 @@
 i8254_init(void)
 {
 
-	mtx_init(&clock_lock, "clk", NULL, MTX_SPIN);
+	mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE);
 	set_timer_freq(timer_freq, hz);
 }
 
--- //depot/vendor/freebsd/src/sys/kern/subr_lock.c	2007/06/03 18:27:39
+++ //depot/user/attilio/attilio_smpng/kern/subr_lock.c	2007/09/12 16:28:07
@@ -274,7 +274,7 @@
 {
         struct lock_profile_object *l = &lo->lo_profile_obj;
 
-        if (l->lpo_acqtime && !(lo->lo_flags & LO_NOPROFILE)) {
+        if (l->lpo_acqtime) {
                 const char *unknown = "(unknown)";
                 u_int64_t acqtime, now, waittime;
                 struct lock_prof *mpp;
--- //depot/vendor/freebsd/src/sys/sys/lock_profile.h	2007/07/11 18:53:37
+++ //depot/user/attilio/attilio_smpng/sys/lock_profile.h	2007/09/12 16:28:07
@@ -119,7 +119,8 @@
 {
 	struct lock_profile_object *l = &lo->lo_profile_obj;
 
-	if (lock_prof_enable && *contested == 0) {
+	if (!(lo->lo_flags & LO_NOPROFILE) && lock_prof_enable &&
+	    *contested == 0) {
 		*waittime = nanoseconds();
 		atomic_add_int(&l->lpo_contest_holding, 1);
 		*contested = 1;
@@ -130,7 +131,8 @@
 {
 	
 	/* don't reset the timer when/if recursing */
-	if (lock_prof_enable && lo->lo_profile_obj.lpo_acqtime == 0) {
+	if (!(lo->lo_flags & LO_NOPROFILE) && lock_prof_enable &&
+	    lo->lo_profile_obj.lpo_acqtime == 0) {
 #ifdef LOCK_PROFILING_FAST
                if (contested == 0)
                        return;
@@ -142,7 +144,7 @@
 {
 	struct lock_profile_object *l = &lo->lo_profile_obj;
 
-	if (l->lpo_acqtime) 
+	if (!(lo->lo_flags & LO_NOPROFILE) && l->lpo_acqtime) 
 		_lock_profile_release_lock(lo);
 }