svn commit: r327447 - head/sys/sys

[Colin Percival]

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