d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r200976 from head to stable/8:

Browse Source 
Minor comment tweaks in rmlocks.

Approved by:	re (kib)
This commit is contained in:
Robert Watson 2010-05-31 21:35:40 +00:00
parent 25d3931a9f
commit b269c05e01
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/kern_rmlock.c
View File

@ -128,9 +128,9 @@ static struct mtx rm_spinlock;
MTX_SYSINIT(rm_spinlock, &rm_spinlock, "rm_spinlock", MTX_SPIN); MTX_SYSINIT(rm_spinlock, &rm_spinlock, "rm_spinlock", MTX_SPIN);
/* /*
* Add or remove tracker from per cpu list. * Add or remove tracker from per-cpu list.
* *
* The per cpu list can be traversed at any time in forward direction from an * The per-cpu list can be traversed at any time in forward direction from an
* interrupt on the *local* cpu. * interrupt on the *local* cpu.
*/ */
static void inline static void inline
@ -257,7 +257,7 @@ _rm_rlock_hard(struct rmlock *rm, struct rm_priotracker *tracker)
return; return;
} }
/* Remove our tracker from the per cpu list. */ /* Remove our tracker from the per-cpu list. */
rm_tracker_remove(pc, tracker); rm_tracker_remove(pc, tracker);
/* Check to see if the IPI granted us the lock after all. */ /* Check to see if the IPI granted us the lock after all. */
@ -274,8 +274,8 @@ _rm_rlock_hard(struct rmlock *rm, struct rm_priotracker *tracker)
*/ */
if ((rm->lock_object.lo_flags & LO_RECURSABLE) != 0) { if ((rm->lock_object.lo_flags & LO_RECURSABLE) != 0) {
/* /*
* Just grand the lock if this thread already have a tracker * Just grant the lock if this thread already has a tracker
* for this lock on the per cpu queue. * for this lock on the per-cpu queue.
*/ */
for (queue = pc->pc_rm_queue.rmq_next; for (queue = pc->pc_rm_queue.rmq_next;
queue != &pc->pc_rm_queue; queue = queue->rmq_next) { queue != &pc->pc_rm_queue; queue = queue->rmq_next) {