The branch main has been updated by olce:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c21c24adde9822a7f364e131ad7b0c4008723502
commit c21c24adde9822a7f364e131ad7b0c4008723502
Author: Olivier Certner <o...@freebsd.org>
AuthorDate: 2024-03-27 17:54:54 +0000
Commit: Olivier Certner <o...@freebsd.org>
CommitDate: 2025-06-18 02:07:57 +0000
runq: More selective includes of <sys/runq.h> to reduce pollution
<sys/proc.h> doesn't need <sys/runq.h>. Remove this include and add it
back for kernel files that relied on the pollution.
Reviewed by: kib
MFC after: 1 month
Event: Kitchener-Waterloo Hackathon 202506
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45387
---
sys/dev/usb/usb_process.h | 1 -
sys/kern/kern_switch.c | 1 +
sys/kern/sched_4bsd.c | 1 +
sys/kern/sched_ule.c | 1 +
sys/sys/proc.h | 1 -
5 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h
index 745d214d2106..1962bdb8b607 100644
--- a/sys/dev/usb/usb_process.h
+++ b/sys/dev/usb/usb_process.h
@@ -31,7 +31,6 @@
#ifndef USB_GLOBAL_INCLUDE_FILE
#include <sys/interrupt.h>
#include <sys/priority.h>
-#include <sys/runq.h>
#endif
/* defines */
diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c
index 610566bcfacf..58dfc8fc8497 100644
--- a/sys/kern/kern_switch.c
+++ b/sys/kern/kern_switch.c
@@ -38,6 +38,7 @@
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/queue.h>
+#include <sys/runq.h>
#include <sys/sched.h>
#include <sys/smp.h>
#include <sys/sysctl.h>
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 6d94cc7f8ed1..133ea4cbf30d 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -48,6 +48,7 @@
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
+#include <sys/runq.h>
#include <sys/sched.h>
#include <sys/sdt.h>
#include <sys/smp.h>
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index d91f20d06667..7d1e188d0b8f 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -52,6 +52,7 @@
#include <sys/proc.h>
#include <sys/resource.h>
#include <sys/resourcevar.h>
+#include <sys/runq.h>
#include <sys/sched.h>
#include <sys/sdt.h>
#include <sys/smp.h>
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index b48681420028..c7e1a1f51cb4 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -54,7 +54,6 @@
#include <sys/osd.h>
#include <sys/priority.h>
#include <sys/rtprio.h> /* XXX. */
-#include <sys/runq.h>
#include <sys/resource.h>
#include <sys/sigio.h>
#include <sys/signal.h>
