Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys sys: Rip <sys/resourcevar.h> out of <uvm/uvm_param.h>.



details:   https://anonhg.NetBSD.org/src/rev/4606650a13c5
branches:  trunk
changeset: 377413:4606650a13c5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Jul 11 09:48:56 2023 +0000

description:
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.

diffstat:

 sys/kern/kern_core.c |   5 +++--
 sys/sys/ksem.h       |  13 ++++++++++++-
 sys/sys/proc.h       |   6 ++++--
 sys/uvm/uvm_param.h  |   3 +--
 4 files changed, 20 insertions(+), 7 deletions(-)

diffs (93 lines):

diff -r ca408f7c82d7 -r 4606650a13c5 sys/kern/kern_core.c
--- a/sys/kern/kern_core.c      Tue Jul 11 09:34:34 2023 +0000
+++ b/sys/kern/kern_core.c      Tue Jul 11 09:48:56 2023 +0000
@@ -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 @@
 #include <sys/module.h>
 #include <sys/compat_stub.h>
 #include <sys/exec_elf.h>
+#include <sys/resourcevar.h>
 
 MODULE(MODULE_CLASS_MISC, coredump, NULL);
 
diff -r ca408f7c82d7 -r 4606650a13c5 sys/sys/ksem.h
--- a/sys/sys/ksem.h    Tue Jul 11 09:34:34 2023 +0000
+++ b/sys/sys/ksem.h    Tue Jul 11 09:48:56 2023 +0000
@@ -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 <alfred%FreeBSD.org@localhost>
@@ -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 {
diff -r ca408f7c82d7 -r 4606650a13c5 sys/sys/proc.h
--- a/sys/sys/proc.h    Tue Jul 11 09:34:34 2023 +0000
+++ b/sys/sys/proc.h    Tue Jul 11 09:48:56 2023 +0000
@@ -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
diff -r ca408f7c82d7 -r 4606650a13c5 sys/uvm/uvm_param.h
--- a/sys/uvm/uvm_param.h       Tue Jul 11 09:34:34 2023 +0000
+++ b/sys/uvm/uvm_param.h       Tue Jul 11 09:48:56 2023 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index