aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2022-06-13 17:35:40 +0000
committerBrooks Davis <brooks@FreeBSD.org>2022-06-13 17:35:40 +0000
commitf6fada5eed38a8ee2338c1747b9fef587c3ae3da (patch)
tree404e1c572e8879034cb41822f84c24f0e5e4b55f
parenta29263b6565145c3596356dce2e743ae13461fa7 (diff)
-rw-r--r--include/i386/Makefile4
-rw-r--r--sys/amd64/include/pcpu.h6
2 files changed, 10 insertions, 0 deletions
diff --git a/include/i386/Makefile b/include/i386/Makefile
index 5bc1a13033e5..70d825bab9cf 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -11,6 +11,10 @@ INCS= \
profile.h \
segments.h \
vmparam.h
+# These kernel-only headers are used by procstat's ZFS support.
+# This should be fixed.
+INCS+= \
+ pcpu.h
INCSDIR= ${INCLUDEDIR}/i386
.include <bsd.prog.mk>
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index a671f01dbad5..8dcf51cc71c6 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -28,6 +28,10 @@
* $FreeBSD$
*/
+#ifdef __i386__
+#include <i386/pcpu.h>
+#else /* !__i386__ */
+
#ifndef _MACHINE_PCPU_H_
#define _MACHINE_PCPU_H_
@@ -274,3 +278,5 @@ _Static_assert(sizeof(struct monitorbuf) == 128, "2x cache line");
#endif /* _KERNEL */
#endif /* !_MACHINE_PCPU_H_ */
+
+#endif /* __i386__ */