From fc1901abcfa95bbdf985ee86ce24fa73c30d5076 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 19 Jan 2023 10:32:45 -0800
Subject: [PATCH] <sys/sysctl.h>: Reduce overly broad header pollution.

Commit d3f96f661050e9bd21fe29931992a8b9e67ff189 removed <sys/queue.h>
and replaced it with the very broad <sys/systm.h>.  However, none of
the changes to sysctl.h in that commit require anything defined in
<sys/systm.h>.  On the other hand, <sys/sysctl.h> does still make use
of queue macros.  Drop the include of <sys/systm.h> and re-add
<sys/queue.h>.

Reviewed by:	imp, kib, asomers
Obtained from:	CheriBSD
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D37950
---
 sys/sys/sysctl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 207ffe4a62e..79da4772615 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -39,8 +39,8 @@
 #define	_SYS_SYSCTL_H_
 
 #ifdef _KERNEL
+#include <sys/queue.h>
 #include <sys/tree.h>
-#include <sys/systm.h>
 #endif
 
 /*