From owner-svn-src-stable-6@FreeBSD.ORG  Fri Mar 13 01:28:11 2009
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 360271065716;
	Fri, 13 Mar 2009 01:28:11 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 242D08FC26;
	Fri, 13 Mar 2009 01:28:11 +0000 (UTC)
	(envelope-from obrien@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 n2D1SB3U045657;
	Fri, 13 Mar 2009 01:28:11 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2D1SBCC045656;
	Fri, 13 Mar 2009 01:28:11 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <200903130128.n2D1SBCC045656@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 13 Mar 2009 01:28:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189751 - stable/6/sys/sys
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Mar 2009 01:28:12 -0000

Author: obrien
Date: Fri Mar 13 01:28:10 2009
New Revision: 189751
URL: http://svn.freebsd.org/changeset/base/189751

Log:
  Catch up with the sx_object -> lock_object change.

Modified:
  stable/6/sys/sys/lock.h

Modified: stable/6/sys/sys/lock.h
==============================================================================
--- stable/6/sys/sys/lock.h	Thu Mar 12 22:01:42 2009	(r189750)
+++ stable/6/sys/sys/lock.h	Fri Mar 13 01:28:10 2009	(r189751)
@@ -301,10 +301,10 @@ const char *witness_file(struct lock_obj
 	    LOCK_LINE)
 
 #define	witness_check_shared_sx(sx)					\
-	WITNESS_CHECKORDER(&(sx)->sx_object, 0, LOCK_FILE, LOCK_LINE)
+	WITNESS_CHECKORDER(&(sx)->lock_object, 0, LOCK_FILE, LOCK_LINE)
 	
 #define	witness_check_exclusive_sx(sx)					\
-	WITNESS_CHECKORDER(&(sx)->sx_object, LOP_EXCLUSIVE, LOCK_FILE,	\
+	WITNESS_CHECKORDER(&(sx)->lock_object, LOP_EXCLUSIVE, LOCK_FILE,	\
 	    LOCK_LINE)
 
 #endif	/* _KERNEL */