svn commit: r234302 - in head/sys: conf kern

Davide Italiano davide at FreeBSD.org
Sat Apr 14 23:53:32 UTC 2012


Author: davide
Date: Sat Apr 14 23:53:31 2012
New Revision: 234302
URL: http://svn.freebsd.org/changeset/base/234302

Log:
  Fix some style bugs introduced in a previous commit (r233045)
  
  Reported by:	glebius, jmallet
  Reviewed by:	jmallet
  Approved by:	gnn (mentor)
  MFC after:	2 days

Modified:
  head/sys/conf/NOTES
  head/sys/kern/kern_umtx.c

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Sat Apr 14 21:51:08 2012	(r234301)
+++ head/sys/conf/NOTES	Sat Apr 14 23:53:31 2012	(r234302)
@@ -300,7 +300,8 @@ options 	MPROF_HASH_SIZE="1543"
 # Profiling for internal hash tables.
 options 	SLEEPQUEUE_PROFILING
 options 	TURNSTILE_PROFILING
-options		UMTX_PROFILING
+options 	UMTX_PROFILING
+
 
 #####################################################################
 # COMPATIBILITY OPTIONS

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Sat Apr 14 21:51:08 2012	(r234301)
+++ head/sys/kern/kern_umtx.c	Sat Apr 14 23:53:31 2012	(r234302)
@@ -271,15 +271,15 @@ umtxq_sysinit(void *arg __unused)
 			TAILQ_INIT(&umtxq_chains[i][j].uc_pi_list);
 			umtxq_chains[i][j].uc_busy = 0;
 			umtxq_chains[i][j].uc_waiters = 0;
-			#ifdef UMTX_PROFILING
+#ifdef UMTX_PROFILING
 			umtxq_chains[i][j].length = 0;
 			umtxq_chains[i][j].max_length = 0;	
-			#endif
+#endif
 		}
 	}
-	#ifdef UMTX_PROFILING
+#ifdef UMTX_PROFILING
 	umtx_init_profiling();
-	#endif
+#endif
 	mtx_init(&umtx_lock, "umtx lock", NULL, MTX_SPIN);
 	EVENTHANDLER_REGISTER(process_exec, umtx_exec_hook, NULL,
 	    EVENTHANDLER_PRI_ANY);
@@ -430,14 +430,14 @@ umtxq_insert_queue(struct umtx_q *uq, in
 
 	TAILQ_INSERT_TAIL(&uh->head, uq, uq_link);
 	uh->length++;
-	#ifdef UMTX_PROFILING
+#ifdef UMTX_PROFILING
 	uc->length++;
 	if (uc->length > uc->max_length) {
 		uc->max_length = uc->length;
 		if (uc->max_length > max_length)
 			max_length = uc->max_length;	
 	}
-	#endif
+#endif
 	uq->uq_flags |= UQF_UMTXQ;
 	uq->uq_cur_queue = uh;
 	return;
@@ -455,9 +455,9 @@ umtxq_remove_queue(struct umtx_q *uq, in
 		uh = uq->uq_cur_queue;
 		TAILQ_REMOVE(&uh->head, uq, uq_link);
 		uh->length--;
-		#ifdef UMTX_PROFILING
+#ifdef UMTX_PROFILING
 		uc->length--;
-		#endif
+#endif
 		uq->uq_flags &= ~UQF_UMTXQ;
 		if (TAILQ_EMPTY(&uh->head)) {
 			KASSERT(uh->length == 0,


More information about the svn-src-all mailing list