From 5d88a2aacf1fa7eb7a2bb522a9dbd78686471a6b Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 15 Apr 2024 17:54:28 +0100
Subject: [PATCH] sysproto.h: sys/acl.h -> sys/types.h

In sysproto.h, stop including sys/acl.h as syscall defintions now use
__acl* types from sys/_types.h.  Add sys/types.h to provide types
previously provided by sys/param.h (via sys/acl.h).

Reviewed by:	kib
Differential Revision:	https://reviews.freebsd.org/D44467
---
 sys/amd64/linux/linux_proto.h          | 2 +-
 sys/amd64/linux32/linux32_proto.h      | 2 +-
 sys/arm64/linux/linux_proto.h          | 2 +-
 sys/compat/freebsd32/freebsd32_proto.h | 2 +-
 sys/i386/linux/linux_proto.h           | 2 +-
 sys/sys/sysproto.h                     | 2 +-
 sys/tools/makesyscalls.lua             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index e02e1e9e64e..065c82d7db5 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -7,8 +7,8 @@
 #ifndef _LINUX_SYSPROTO_H_
 #define	_LINUX_SYSPROTO_H_
 
+#include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/acl.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/_ffcounter.h>
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index 8da298847a4..59bb85e742d 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -7,8 +7,8 @@
 #ifndef _LINUX32_SYSPROTO_H_
 #define	_LINUX32_SYSPROTO_H_
 
+#include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/acl.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/_ffcounter.h>
diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index c42de57d77c..1a5335af05b 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -7,8 +7,8 @@
 #ifndef _LINUX_SYSPROTO_H_
 #define	_LINUX_SYSPROTO_H_
 
+#include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/acl.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/_ffcounter.h>
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index c56a5b55f06..cbb95f2b835 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -7,8 +7,8 @@
 #ifndef _FREEBSD32_SYSPROTO_H_
 #define	_FREEBSD32_SYSPROTO_H_
 
+#include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/acl.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/_ffcounter.h>
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 8109afec72e..f894310b01c 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -7,8 +7,8 @@
 #ifndef _LINUX_SYSPROTO_H_
 #define	_LINUX_SYSPROTO_H_
 
+#include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/acl.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/_ffcounter.h>
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 3d4c30a89a8..c86c5d1eb21 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -7,8 +7,8 @@
 #ifndef _SYS_SYSPROTO_H_
 #define	_SYS_SYSPROTO_H_
 
+#include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/acl.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/_ffcounter.h>
diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua
index 6f21079d0eb..624b84a32eb 100644
--- a/sys/tools/makesyscalls.lua
+++ b/sys/tools/makesyscalls.lua
@@ -1431,8 +1431,8 @@ write_line("sysarg", string.format([[/*
 #ifndef %s
 #define	%s
 
+#include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/acl.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/_ffcounter.h>