From owner-svn-src-head@freebsd.org  Sun Dec 31 21:00:22 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 EC4FFEA729A;
 Sun, 31 Dec 2017 21:00:22 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B41F53914;
 Sun, 31 Dec 2017 21:00:22 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBVL0LaS038784;
 Sun, 31 Dec 2017 21:00:21 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBVL0L0a038783;
 Sun, 31 Dec 2017 21:00:21 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201712312100.vBVL0L0a038783@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sun, 31 Dec 2017 21:00:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327447 - head/sys/sys
X-SVN-Group: head
X-SVN-Commit-Author: cperciva
X-SVN-Commit-Paths: head/sys/sys
X-SVN-Commit-Revision: 327447
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Dec 2017 21:00:23 -0000

Author: cperciva
Date: Sun Dec 31 21:00:21 2017
New Revision: 327447
URL: https://svnweb.freebsd.org/changeset/base/327447

Log:
  Wrap includes in sys/tslog.h with #ifdef TSLOG.
  
  This is necessary because some non-kernel code #defines _KERNEL and then
  includes kernel headers; as a result, it was getting conflicting versions
  of curthread and curproc.  Non-kernel code should probably refrain from
  defining _KERNEL, but for now hiding these indirect inclusions fixes the
  build.
  
  Reported by:	Michael Butler, Herbert J. Skuhra

Modified:
  head/sys/sys/tslog.h

Modified: head/sys/sys/tslog.h
==============================================================================
--- head/sys/sys/tslog.h	Sun Dec 31 20:30:51 2017	(r327446)
+++ head/sys/sys/tslog.h	Sun Dec 31 21:00:21 2017	(r327447)
@@ -29,8 +29,10 @@
 #ifndef _TSLOG_H_
 #define	_TSLOG_H_
 
+#ifdef TSLOG
 #include <sys/_types.h>
 #include <sys/pcpu.h>
+#endif
 
 #define TS_ENTER	0
 #define TS_EXIT		1