svn commit: r252209 - in head: share/man/man9 sys/kern sys/sys

[Matthew D. Fuller]

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 at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.