From owner-svn-src-head@FreeBSD.ORG  Sun Jul  7 11:45:58 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0CAF03CA;
 Sun,  7 Jul 2013 11:45:58 +0000 (UTC)
 (envelope-from fullermd@over-yonder.net)
Received: from thyme.infocus-llc.com (server.infocus-llc.com [206.156.254.44])
 by mx1.freebsd.org (Postfix) with ESMTP id 2196F1112;
 Sun,  7 Jul 2013 11:45:56 +0000 (UTC)
Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net
 [75.65.60.66])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by thyme.infocus-llc.com (Postfix) with ESMTPSA id B31E737B4E0;
 Sun,  7 Jul 2013 06:45:55 -0500 (CDT)
Received: by draco.over-yonder.net (Postfix, from userid 100)
 id 3bp7KH2GpxzSZk; Sun,  7 Jul 2013 06:45:55 -0500 (CDT)
Date: Sun, 7 Jul 2013 06:45:55 -0500
From: "Matthew D. Fuller" <fullermd@over-yonder.net>
To: John Baldwin <jhb@FreeBSD.org>
Subject: Re: svn commit: r252209 - in head: share/man/man9 sys/kern sys/sys
Message-ID: <20130707114555.GB13386@over-yonder.net>
References: <201306251844.r5PIiFDZ009708@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201306251844.r5PIiFDZ009708@svn.freebsd.org>
X-Editor: vi
X-OS: FreeBSD <http://www.freebsd.org/>
User-Agent: Mutt/1.5.21-fullermd.4 (2010-09-15)
X-Virus-Scanned: clamav-milter 0.97.8 at thyme.infocus-llc.com
X-Virus-Status: Clean
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
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: Sun, 07 Jul 2013 11:45:58 -0000

On Tue, Jun 25, 2013 at 06:44:15PM +0000 I heard the voice of
John Baldwin, and lo! it spake thus:
> Author: jhb
> Date: Tue Jun 25 18:44:15 2013
> New Revision: 252209
> URL: http://svnweb.freebsd.org/changeset/base/252209
> 
> Log:
>   Several improvements to rmlock(9).  Many of these are based on patches
>   provided by Isilon.

This breaks the kernel build with INVARIANT_SUPPORT but not
INVARIANTS:

/usr/src/sys/kern/kern_rmlock.c:714:1: error: expected identifier or '('

Presumably, because:


> +#ifndef INVARIANTS
> +#define	_rm_assert(c, what, file, line)
> +#endif

thus #define's, but then later

> +#ifdef INVARIANT_SUPPORT
> +/*
> + * Note that this does not need to use witness_assert() for read lock
> + * assertions since an exact count of read locks held by this thread
> + * is computable.
> + */
> +void
> +_rm_assert(const struct rmlock *rm, int what, const char *file, int line)

tries to make a function but the preprocessor has already munged it
up.


-- 
Matthew Fuller     (MF4839)   |  fullermd@over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.