From owner-freebsd-current@freebsd.org  Sun Dec 31 17:35:29 2017
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89947E88B5B
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Sun, 31 Dec 2017 17:35:29 +0000 (UTC)
 (envelope-from herbert@gojira.at)
Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:191:217b::25])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mail.bsd4all.net",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A1237BDA2;
 Sun, 31 Dec 2017 17:35:29 +0000 (UTC)
 (envelope-from herbert@gojira.at)
Date: Sun, 31 Dec 2017 18:35:24 +0100
Message-ID: <87h8s6kdgj.wl-herbert@gojira.at>
From: "Herbert J. Skuhra" <herbert@gojira.at>
To: freebsd-current@freebsd.org
Cc: Colin Percival <cperciva@FreeBSD.org>
Subject: Re: SVN r327433 fails to build
In-Reply-To: <8a05059f-5ece-7655-f661-4d53ebe760ee@protected-networks.net>
References: <8a05059f-5ece-7655-f661-4d53ebe760ee@protected-networks.net>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue)
 FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/27.0
 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue")
Content-Type: text/plain; charset=US-ASCII
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Dec 2017 17:35:29 -0000

On Sun, 31 Dec 2017 15:19:21 +0100,
Michael Butler <imb@protected-networks.net> wrote:
> 
> An include file change? I couldn't see the cause :-(
> 
> The last successful build I have is at SVN r327392.
> 
> ===> lib/libprocstat (obj,all,install)
> Building /usr/obj/usr/src/amd64.amd64/lib/libprocstat/zfs/zfs.o
> In file included from /usr/src/lib/libprocstat/zfs.c:41:
> /usr/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:217:9:
> error: 'curthread' macro redefined [-Werror,-Wmacro-redefined]
> #define curthread       ((void *)(uintptr_t)thr_self())
>         ^
> /usr/obj/usr/src/amd64.amd64/tmp/usr/include/machine/pcpu.h:230:9: note:
> previous definition is here
> #define curthread               (__curthread())
>         ^
> In file included from /usr/src/lib/libprocstat/zfs.c:41:
> /usr/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:236:9:
> error: 'curproc' macro redefined [-Werror,-Wmacro-redefined]
> #define curproc         (&p0)
>         ^
> /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/pcpu.h:200:9: note:
> previous definition is here
> #define curproc         (curthread->td_proc)
>         ^
> 2 errors generated.

This is caused by

------------------------------------------------------------------------
r327429 | cperciva | 2017-12-31 10:23:35 +0100 (Sun, 31 Dec 2017) | 2 lines

Use the TSLOG framework to record entry/exit timestamps for VFS_MOUNT calls.

------------------------------------------------------------------------

--
Herbert