From 0337438d5d9158ce6d08948a1a21ac1499debd98 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sun, 31 Dec 2017 21:00:21 +0000
Subject: [PATCH] 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
---
 sys/sys/tslog.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/sys/tslog.h b/sys/sys/tslog.h
index 252e32e9db4f..4b2971e4e643 100644
--- a/sys/sys/tslog.h
+++ b/sys/sys/tslog.h
@@ -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