From a69511db186e3576ab144be31539d3986cdc8a51 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 13 Jun 2022 18:35:39 +0100
Subject: [PATCH] amd64: -m32 support for machine/vmparam.h

Install the i386 vmparam.h under /usr/include/i386 on amd64 and include
when targeting i386.

Reviewed by:	jhb, imp
---
 include/i386/Makefile       | 3 ++-
 sys/amd64/include/vmparam.h | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/i386/Makefile b/include/i386/Makefile
index 9b31431549b7..5bc1a13033e5 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -9,7 +9,8 @@ INCS=	\
 	pmap.h \
 	proc.h \
 	profile.h \
-	segments.h
+	segments.h \
+	vmparam.h
 INCSDIR=	${INCLUDEDIR}/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index c841cc41f17b..fc88296f754c 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -43,6 +43,10 @@
  * $FreeBSD$
  */
 
+#ifdef __i386__
+#include <i386/vmparam.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_VMPARAM_H_
 #define	_MACHINE_VMPARAM_H_ 1
 
@@ -302,3 +306,5 @@
 #define MINIDUMP_PAGE_TRACKING	1
 
 #endif /* _MACHINE_VMPARAM_H_ */
+
+#endif /* __i386__ */