From owner-svn-src-head@FreeBSD.ORG  Tue Dec 11 05:59:16 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C674191D;
 Tue, 11 Dec 2012 05:59:16 +0000 (UTC)
 (envelope-from alfred@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ACAC28FC13;
 Tue, 11 Dec 2012 05:59:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBB5xGbN012409;
 Tue, 11 Dec 2012 05:59:16 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBB5xGAB012408;
 Tue, 11 Dec 2012 05:59:16 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201212110559.qBB5xGAB012408@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Tue, 11 Dec 2012 05:59:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244111 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 05:59:16 -0000

Author: alfred
Date: Tue Dec 11 05:59:16 2012
New Revision: 244111
URL: http://svnweb.freebsd.org/changeset/base/244111

Log:
  Fix WITNESS when INVARIANT_SUPPORT is defined.
  
  This fixes tinderbox breakage from r244105.
  
  Pointed out by: adrian

Modified:
  head/sys/kern/subr_witness.c

Modified: head/sys/kern/subr_witness.c
==============================================================================
--- head/sys/kern/subr_witness.c	Tue Dec 11 05:11:28 2012	(r244110)
+++ head/sys/kern/subr_witness.c	Tue Dec 11 05:59:16 2012	(r244111)
@@ -2263,6 +2263,7 @@ witness_assert(const struct lock_object 
 	else {
 		kassert_panic("Lock (%s) %s is not sleep or spin!",
 		    class->lc_name, lock->lo_name);
+		return;
 	}
 	switch (flags) {
 	case LA_UNLOCKED: