Module Name: src
Committed By: riastradh
Date: Tue Jul 11 09:48:56 UTC 2023
Modified Files:
src/sys/kern: kern_core.c
src/sys/sys: ksem.h proc.h
src/sys/uvm: uvm_param.h
Log Message:
sys: Rip <sys/resourcevar.h> out of <uvm/uvm_param.h>.
And thus out of <sys/param.h>, which is exceedingly overused and
fragile and delenda est.
Should fix (some) issues with the recent inclusion of machine/lock.h
in various machine/mutex.h files.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_core.c
cvs rdiff -u -r1.15 -r1.16 src/sys/sys/ksem.h
cvs rdiff -u -r1.371 -r1.372 src/sys/sys/proc.h
cvs rdiff -u -r1.41 -r1.42 src/sys/uvm/uvm_param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_core.c
diff -u src/sys/kern/kern_core.c:1.37 src/sys/kern/kern_core.c:1.38
--- src/sys/kern/kern_core.c:1.37 Sat Sep 10 07:30:41 2022
+++ src/sys/kern/kern_core.c Tue Jul 11 09:48:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_core.c,v 1.37 2022/09/10 07:30:41 mrg Exp $ */
+/* $NetBSD: kern_core.c,v 1.38 2023/07/11 09:48:56 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.37 2022/09/10 07:30:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_core.c,v 1.38 2023/07/11 09:48:56 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -57,6 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_core.c,
#include <sys/module.h>
#include <sys/compat_stub.h>
#include <sys/exec_elf.h>
+#include <sys/resourcevar.h>
MODULE(MODULE_CLASS_MISC, coredump, NULL);
Index: src/sys/sys/ksem.h
diff -u src/sys/sys/ksem.h:1.15 src/sys/sys/ksem.h:1.16
--- src/sys/sys/ksem.h:1.15 Sun Feb 3 03:20:24 2019
+++ src/sys/sys/ksem.h Tue Jul 11 09:48:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ksem.h,v 1.15 2019/02/03 03:20:24 thorpej Exp $ */
+/* $NetBSD: ksem.h,v 1.16 2023/07/11 09:48:56 riastradh Exp $ */
/*
* Copyright (c) 2002 Alfred Perlstein <alf...@freebsd.org>
@@ -31,9 +31,20 @@
#include <sys/cdefs.h>
+#include <sys/types.h>
+
struct timespec;
#ifdef _KERNEL
+
+#include <sys/condvar.h>
+#include <sys/mutex.h>
+#include <sys/queue.h>
+#include <sys/systm.h>
+
+struct lwp;
+struct proc;
+
#define KSEM_MAX 128
typedef struct ksem {
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.371 src/sys/sys/proc.h:1.372
--- src/sys/sys/proc.h:1.371 Mon May 1 05:12:44 2023
+++ src/sys/sys/proc.h Tue Jul 11 09:48:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.371 2023/05/01 05:12:44 mlelstv Exp $ */
+/* $NetBSD: proc.h,v 1.372 2023/07/11 09:48:56 riastradh Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -93,7 +93,9 @@
#include <sys/event.h>
#include <sys/specificdata.h>
-#ifndef _KERNEL
+#ifdef _KERNEL
+#include <sys/resourcevar.h>
+#else
#include <sys/time.h>
#include <sys/resource.h>
#endif
Index: src/sys/uvm/uvm_param.h
diff -u src/sys/uvm/uvm_param.h:1.41 src/sys/uvm/uvm_param.h:1.42
--- src/sys/uvm/uvm_param.h:1.41 Thu Jul 23 19:07:01 2020
+++ src/sys/uvm/uvm_param.h Tue Jul 11 09:48:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_param.h,v 1.41 2020/07/23 19:07:01 skrll Exp $ */
+/* $NetBSD: uvm_param.h,v 1.42 2023/07/11 09:48:56 riastradh Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -74,7 +74,6 @@
#ifdef _KERNEL
#include <sys/types.h>
#include <machine/vmparam.h>
-#include <sys/resourcevar.h>
#endif
#if defined(_KERNEL)
