From owner-svn-src-all@FreeBSD.ORG Tue Jan 28 17:27:55 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7869B28B; Tue, 28 Jan 2014 17:27:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A31813C3; Tue, 28 Jan 2014 17:27:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SHRtHE088243; Tue, 28 Jan 2014 17:27:55 GMT (envelope-from jmg@svn.freebsd.org) Received: (from jmg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SHRs82088237; Tue, 28 Jan 2014 17:27:54 GMT (envelope-from jmg@svn.freebsd.org) Message-Id: <201401281727.s0SHRs82088237@svn.freebsd.org> From: John-Mark Gurney Date: Tue, 28 Jan 2014 17:27:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261238 - in head/sys: kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 17:27:55 -0000 Author: jmg Date: Tue Jan 28 17:27:54 2014 New Revision: 261238 URL: http://svnweb.freebsd.org/changeset/base/261238 Log: fix spelling of lock_initialized.. jhb approved.. MFC after: 1 week Modified: head/sys/kern/subr_lock.c head/sys/sys/lock.h head/sys/sys/mutex.h head/sys/sys/rwlock.h Modified: head/sys/kern/subr_lock.c ============================================================================== --- head/sys/kern/subr_lock.c Tue Jan 28 17:23:44 2014 (r261237) +++ head/sys/kern/subr_lock.c Tue Jan 28 17:27:54 2014 (r261238) @@ -78,7 +78,7 @@ lock_init(struct lock_object *lock, stru int i; /* Check for double-init and zero object. */ - KASSERT(!lock_initalized(lock), ("lock \"%s\" %p already initialized", + KASSERT(!lock_initialized(lock), ("lock \"%s\" %p already initialized", name, lock)); /* Look up lock class to find its index. */ @@ -100,7 +100,7 @@ void lock_destroy(struct lock_object *lock) { - KASSERT(lock_initalized(lock), ("lock %p is not initialized", lock)); + KASSERT(lock_initialized(lock), ("lock %p is not initialized", lock)); WITNESS_DESTROY(lock); LOCK_LOG_DESTROY(lock, 0); lock->lo_flags &= ~LO_INITIALIZED; Modified: head/sys/sys/lock.h ============================================================================== --- head/sys/sys/lock.h Tue Jan 28 17:23:44 2014 (r261237) +++ head/sys/sys/lock.h Tue Jan 28 17:27:54 2014 (r261238) @@ -178,7 +178,7 @@ struct lock_class { #define LOCK_LOG_DESTROY(lo, flags) LOCK_LOG_INIT(lo, flags) -#define lock_initalized(lo) ((lo)->lo_flags & LO_INITIALIZED) +#define lock_initialized(lo) ((lo)->lo_flags & LO_INITIALIZED) /* * Helpful macros for quickly coming up with assertions with informative Modified: head/sys/sys/mutex.h ============================================================================== --- head/sys/sys/mutex.h Tue Jan 28 17:23:44 2014 (r261237) +++ head/sys/sys/mutex.h Tue Jan 28 17:27:54 2014 (r261238) @@ -382,7 +382,7 @@ extern struct mtx_pool *mtxpool_sleep; _sleep((chan), &(mtx)->lock_object, (pri), (wmesg), \ tick_sbt * (timo), 0, C_HARDCLOCK) -#define mtx_initialized(m) lock_initalized(&(m)->lock_object) +#define mtx_initialized(m) lock_initialized(&(m)->lock_object) #define mtx_owned(m) (((m)->mtx_lock & ~MTX_FLAGMASK) == (uintptr_t)curthread) Modified: head/sys/sys/rwlock.h ============================================================================== --- head/sys/sys/rwlock.h Tue Jan 28 17:23:44 2014 (r261237) +++ head/sys/sys/rwlock.h Tue Jan 28 17:27:54 2014 (r261238) @@ -218,7 +218,7 @@ void __rw_assert(const volatile uintptr_ _sleep((chan), &(rw)->lock_object, (pri), (wmesg), \ tick_sbt * (timo), 0, C_HARDCLOCK) -#define rw_initialized(rw) lock_initalized(&(rw)->lock_object) +#define rw_initialized(rw) lock_initialized(&(rw)->lock_object) struct rw_args { void *ra_rw;