From owner-svn-src-head@FreeBSD.ORG  Wed May 20 18:29:15 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 398E51065678;
	Wed, 20 May 2009 18:29:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2771A8FC2C;
	Wed, 20 May 2009 18:29:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4KITEj4039700;
	Wed, 20 May 2009 18:29:14 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4KITErS039699;
	Wed, 20 May 2009 18:29:14 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200905201829.n4KITErS039699@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 20 May 2009 18:29:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192456 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 20 May 2009 18:29:15 -0000

Author: jhb
Date: Wed May 20 18:29:14 2009
New Revision: 192456
URL: http://svn.freebsd.org/changeset/base/192456

Log:
  Remove an obsolete assertion.  We always wake up all waiters when unlocking
  a mutex and never set the lock cookie == MTX_CONTESTED.

Modified:
  head/sys/kern/kern_mutex.c

Modified: head/sys/kern/kern_mutex.c
==============================================================================
--- head/sys/kern/kern_mutex.c	Wed May 20 18:25:16 2009	(r192455)
+++ head/sys/kern/kern_mutex.c	Wed May 20 18:29:14 2009	(r192456)
@@ -364,8 +364,6 @@ _mtx_lock_sleep(struct mtx *m, uintptr_t
 			continue;
 		}
 
-		MPASS(v != MTX_CONTESTED);
-
 #ifdef ADAPTIVE_MUTEXES
 		/*
 		 * If the current owner of the lock is executing on another