From owner-freebsd-current@FreeBSD.ORG  Mon Aug 28 14:38:51 2006
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@FreeBSD.org
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E4BF716A53C
	for <freebsd-current@FreeBSD.org>; Mon, 28 Aug 2006 14:38:51 +0000 (UTC)
	(envelope-from kuriyama@imgsrc.co.jp)
Received: from black.imgsrc.co.jp (black.imgsrc.co.jp [210.226.20.147])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 883C143D45
	for <freebsd-current@FreeBSD.org>; Mon, 28 Aug 2006 14:38:51 +0000 (GMT)
	(envelope-from kuriyama@imgsrc.co.jp)
Received: from localhost (localhost [127.0.0.1])
	by black.imgsrc.co.jp (Postfix) with ESMTP id 5542850EA0;
	Mon, 28 Aug 2006 23:38:50 +0900 (JST)
Received: from pink.imgsrc.co.jp (pink.imgsrc.co.jp [210.226.20.36])
	by black.imgsrc.co.jp (Postfix) with ESMTP id B56B850E82;
	Mon, 28 Aug 2006 23:38:47 +0900 (JST)
Date: Mon, 28 Aug 2006 23:38:47 +0900
Message-ID: <7m3bbhx6vc.wl%kuriyama@imgsrc.co.jp>
From: Jun Kuriyama <kuriyama@imgsrc.co.jp>
To: Current <freebsd-current@FreeBSD.org>
User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.8
	(=?ISO-8859-4?Q?Shij=F2?=) APEL/10.6 Emacs/21.3 (i386--freebsd)
	MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
X-Virus-Scanned: by amavisd 0.1
Cc: Jun Kuriyama <kuriyama@imgsrc.co.jp>
Subject: INVARIANTS in sys/sys/sx.h
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Aug 2006 14:38:52 -0000


I found this when I compiled my kernel with INVARIANTS without
INVARIANT_SUPPORT.

In src/sys/sys/sx.h, _sx_assert() is defined in INVARIANT_SUPPORT,

> #ifdef INVARIANT_SUPPORT
> void	_sx_assert(struct sx *sx, int what, const char *file, int line);
> #endif

but sx_assert() uses this function in INVARIANTS option.

> #ifdef INVARIANTS
> #define	sx_assert(sx, what)	_sx_assert((sx), (what), LOCK_FILE, LOCK_LINE)
> #else
> #define	sx_assert(sx, what)
> #endif

Is this consistent?


-- 
Jun Kuriyama <kuriyama@imgsrc.co.jp> // IMG SRC, Inc.
             <kuriyama@FreeBSD.org> // FreeBSD Project