From owner-cvs-all@FreeBSD.ORG  Sun Jul  3 01:10:37 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E43EF16AC53;
	Sun,  3 Jul 2005 00:58:39 +0000 (GMT) (envelope-from ps@mu.org)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD1BC446DD;
	Sun,  3 Jul 2005 00:43:06 +0000 (GMT) (envelope-from ps@mu.org)
Received: by elvis.mu.org (Postfix, from userid 1000)
	id D14A66DD15; Sat,  2 Jul 2005 17:38:13 -0700 (PDT)
X-Original-To: ps@mu.org
Delivered-To: ps@mu.org
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by elvis.mu.org (Postfix) with ESMTP id 106A25C990
	for <ps@mu.org>; Tue, 25 Jan 2005 08:06:13 -0800 (PST)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id DF37856B3B
	for <ps@mu.org>; Tue, 25 Jan 2005 16:06:12 +0000 (GMT)
	(envelope-from owner-src-committers@FreeBSD.org)
Received: by hub.freebsd.org (Postfix)
	id 635D816A53F; Tue, 25 Jan 2005 16:06:08 +0000 (GMT)
Delivered-To: ps@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 538)
	id 4A56516A4D1; Tue, 25 Jan 2005 16:06:06 +0000 (GMT)
Delivered-To: src-committers@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6B13316A4CE; Tue, 25 Jan 2005 16:06:05 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3B64F43D5D; Tue, 25 Jan 2005 16:06:05 +0000 (GMT)
	(envelope-from jeff@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0PG65Sa054209;
	Tue, 25 Jan 2005 16:06:05 GMT
	(envelope-from jeff@repoman.freebsd.org)
Received: (from jeff@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0PG658q054208;
	Tue, 25 Jan 2005 16:06:05 GMT (envelope-from jeff)
Message-Id: <200501251606.j0PG658q054208@repoman.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-src-committers@FreeBSD.org
Precedence: bulk
X-Loop: FreeBSD.ORG
X-Spam-Checker-Version: SpamAssassin 3.0.1 (2004-10-22) on elvis.mu.org
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham 
	version=3.0.1
X-Spam-Level: 
Cc: 
Subject: cvs commit: src/sys/sys lockmgr.h src/sys/kern kern_lock.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
Date: Sun, 03 Jul 2005 01:10:38 -0000
X-Original-Date: Tue, 25 Jan 2005 16:06:05 +0000 (UTC)
X-List-Received-Date: Sun, 03 Jul 2005 01:10:38 -0000

jeff        2005-01-25 16:06:05 UTC

  FreeBSD src repository

  Modified files:
    sys/sys              lockmgr.h 
    sys/kern             kern_lock.c 
  Log:
   - Include LK_INTERLOCK in LK_EXTFLG_MASK so that it makes its way into
     acquire.
   - Correct the condition that causes us to skip apause() to only require
     the presence of LK_INTERLOCK.
  
  Sponsored by:   Isilon Systems, Inc.
  
  Revision  Changes    Path
  1.80      +1 -1      src/sys/kern/kern_lock.c
  1.42      +1 -1      src/sys/sys/lockmgr.h