Author: rwatson
Date: Mon May 31 21:35:40 2010
New Revision: 208675
URL: http://svn.freebsd.org/changeset/base/208675
Log:
Merge r200976 from head to stable/8:
Minor comment tweaks in rmlocks.
Approved by: re (kib)
Modified:
stable/8/sys/kern/kern_rmlock.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/kern/kern_rmlock.c
==============================================================================
--- stable/8/sys/kern/kern_rmlock.c Mon May 31 21:14:56 2010
(r208674)
+++ stable/8/sys/kern/kern_rmlock.c Mon May 31 21:35:40 2010
(r208675)
@@ -128,9 +128,9 @@ static struct mtx rm_spinlock;
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.
*/
static void inline
@@ -257,7 +257,7 @@ _rm_rlock_hard(struct rmlock *rm, struct
return;
}
- /* Remove our tracker from the per cpu list. */
+ /* Remove our tracker from the per-cpu list. */
rm_tracker_remove(pc, tracker);
/* Check to see if the IPI granted us the lock after all. */
@@ -274,8 +274,8 @@ _rm_rlock_hard(struct rmlock *rm, struct
*/
if ((rm->lock_object.lo_flags & LO_RECURSABLE) != 0) {
/*
- * Just grand the lock if this thread already have a tracker
- * for this lock on the per cpu queue.
+ * Just grant the lock if this thread already has a tracker
+ * for this lock on the per-cpu queue.
*/
for (queue = pc->pc_rm_queue.rmq_next;
queue != &pc->pc_rm_queue; queue = queue->rmq_next) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
