diff options
| author | davide <davide@FreeBSD.org> | 2012-04-14 23:53:31 +0000 |
|---|---|---|
| committer | davide <davide@FreeBSD.org> | 2012-04-14 23:53:31 +0000 |
| commit | ff8b0a29f3ea42fd9624faaeb9f565a0c836722e (patch) | |
| tree | 5f92b2de266264172b874018098570a0652a2726 | |
| parent | 7ad5fb089748428df24973a4ec4d6f67091aa670 (diff) | |
| download | FreeBSD-src-ff8b0a29f3ea42fd9624faaeb9f565a0c836722e.zip FreeBSD-src-ff8b0a29f3ea42fd9624faaeb9f565a0c836722e.tar.gz | |
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
| -rw-r--r-- | sys/conf/NOTES | 3 | ||||
| -rw-r--r-- | sys/kern/kern_umtx.c | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a624a40..889c532 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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 diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index c2f5ca3..534a3c3 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -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, int q) 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, int q) 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, |
